From 2f6979e7166ed823f36ea640358fca118c73a278 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Thu, 31 Oct 2019 16:24:11 +0100 Subject: [PATCH] update orgmode --- bba.org | 8 +- elpa/ob-async-20190122.31/ob-async-pkg.el | 2 - .../ob-async-autoloads.el | 11 +- elpa/ob-async-20190916.1537/ob-async-pkg.el | 2 + .../ob-async.el | 77 +- .../ob-cfengine3-autoloads.el | 22 - .../ob-cfengine3-pkg.el | 2 - .../ob-cfengine3.el | 105 - .../ob-cfengine3-autoloads.el | 16 + .../ob-cfengine3-pkg.el | 2 + .../ob-cfengine3.el | 220 + .../ob-restclient-pkg.el | 2 - .../ob-restclient-autoloads.el | 11 +- .../ob-restclient-pkg.el | 2 + .../ob-restclient.el | 23 +- .../ob-tmux-autoloads.el | 22 - .../ob-tmux-autoloads.el | 15 + .../ob-tmux-pkg.el | 2 +- .../ob-tmux.el | 122 +- elpa/{org-20190930 => org-20191028}/COPYING | 0 .../README_ELPA | 0 elpa/{org-20190930 => org-20191028}/dir | 0 .../etc/ORG-NEWS | 0 .../etc/styles/OrgOdtContentTemplate.xml | 0 .../etc/styles/OrgOdtStyles.xml | 0 .../etc/styles/README | 0 elpa/{org-20190930 => org-20191028}/ob-C.el | 0 elpa/{org-20190930 => org-20191028}/ob-J.el | 0 elpa/{org-20190930 => org-20191028}/ob-R.el | 0 elpa/{org-20190930 => org-20191028}/ob-abc.el | 0 .../ob-asymptote.el | 0 elpa/{org-20190930 => org-20191028}/ob-awk.el | 0 .../{org-20190930 => org-20191028}/ob-calc.el | 0 .../ob-clojure.el | 0 .../ob-comint.el | 0 elpa/{org-20190930 => org-20191028}/ob-coq.el | 0 .../{org-20190930 => org-20191028}/ob-core.el | 8 +- elpa/{org-20190930 => org-20191028}/ob-css.el | 0 .../ob-ditaa.el | 0 elpa/{org-20190930 => org-20191028}/ob-dot.el | 0 .../{org-20190930 => org-20191028}/ob-ebnf.el | 0 .../ob-emacs-lisp.el | 0 .../{org-20190930 => org-20191028}/ob-eval.el | 0 elpa/{org-20190930 => org-20191028}/ob-exp.el | 0 .../ob-forth.el | 0 .../ob-fortran.el | 0 .../ob-gnuplot.el | 0 .../ob-groovy.el | 0 .../ob-haskell.el | 0 .../ob-hledger.el | 0 elpa/{org-20190930 => org-20191028}/ob-io.el | 0 .../{org-20190930 => org-20191028}/ob-java.el | 0 elpa/{org-20190930 => org-20191028}/ob-js.el | 0 .../{org-20190930 => org-20191028}/ob-keys.el | 0 .../ob-latex.el | 0 .../ob-ledger.el | 0 .../ob-lilypond.el | 0 .../{org-20190930 => org-20191028}/ob-lisp.el | 0 elpa/{org-20190930 => org-20191028}/ob-lob.el | 0 elpa/{org-20190930 => org-20191028}/ob-lua.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-20190930 => org-20191028}/ob-org.el | 0 .../{org-20190930 => org-20191028}/ob-perl.el | 0 .../ob-picolisp.el | 0 .../ob-plantuml.el | 0 .../ob-processing.el | 0 .../ob-python.el | 0 elpa/{org-20190930 => org-20191028}/ob-ref.el | 0 .../{org-20190930 => org-20191028}/ob-ruby.el | 0 .../{org-20190930 => org-20191028}/ob-sass.el | 0 .../ob-scheme.el | 2 +- .../ob-screen.el | 0 elpa/{org-20190930 => org-20191028}/ob-sed.el | 0 .../ob-shell.el | 8 +- .../{org-20190930 => org-20191028}/ob-shen.el | 0 elpa/{org-20190930 => org-20191028}/ob-sql.el | 0 .../ob-sqlite.el | 0 .../{org-20190930 => org-20191028}/ob-stan.el | 0 .../ob-table.el | 0 .../ob-tangle.el | 0 .../{org-20190930 => org-20191028}/ob-vala.el | 0 elpa/{org-20190930 => org-20191028}/ob.el | 0 elpa/{org-20190930 => org-20191028}/org | 0 .../org-agenda.el | 0 .../org-archive.el | 0 .../org-attach.el | 0 .../org-autoloads.el | 757 +-- .../org-bbdb.el | 0 .../org-bibtex.el | 0 .../org-capture.el | 0 .../org-clock.el | 2 +- .../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-duration.el | 0 .../org-element.el | 0 .../org-entities.el | 0 .../org-eshell.el | 0 .../{org-20190930 => org-20191028}/org-eww.el | 0 .../org-faces.el | 0 .../org-feed.el | 0 .../org-footnote.el | 0 .../org-gnus.el | 0 .../org-goto.el | 0 .../org-habit.el | 0 elpa/{org-20190930 => org-20191028}/org-id.el | 0 .../org-indent.el | 0 .../org-info.el | 0 .../org-inlinetask.el | 0 .../org-install.el | 0 .../{org-20190930 => org-20191028}/org-irc.el | 0 .../org-lint.el | 0 .../org-list.el | 0 .../org-loaddefs.el | 67 +- .../org-macro.el | 0 .../org-macs.el | 0 .../{org-20190930 => org-20191028}/org-mhe.el | 0 .../org-mobile.el | 0 .../org-mouse.el | 0 .../org-pcomplete.el | 0 .../{org-20190930 => org-20191028}/org-pkg.el | 2 +- .../org-plot.el | 0 .../org-protocol.el | 0 .../org-rmail.el | 0 .../{org-20190930 => org-20191028}/org-src.el | 0 .../org-table.el | 0 .../org-tempo.el | 0 .../org-timer.el | 0 .../org-version.el | 2 +- .../{org-20190930 => org-20191028}/org-w3m.el | 0 elpa/{org-20190930 => org-20191028}/org.el | 0 .../orgcard.pdf | Bin 118708 -> 118708 bytes .../ox-ascii.el | 0 .../ox-beamer.el | 0 .../{org-20190930 => org-20191028}/ox-html.el | 0 .../ox-icalendar.el | 0 .../ox-latex.el | 0 elpa/{org-20190930 => org-20191028}/ox-man.el | 0 elpa/{org-20190930 => org-20191028}/ox-md.el | 0 elpa/{org-20190930 => org-20191028}/ox-odt.el | 0 elpa/{org-20190930 => org-20191028}/ox-org.el | 0 .../ox-publish.el | 0 .../ox-texinfo.el | 0 elpa/{org-20190930 => org-20191028}/ox.el | 2 +- .../org-chef-autoloads.el | 146 - .../org-chef-budget-bytes.el | 121 - .../org-chef-24kitchen.el | 90 + .../org-chef-all-recipes.el | 2 +- .../org-chef-autoloads.el | 33 + .../org-chef-chef-koch.el | 24 +- .../org-chef-cultures-for-health.el | 2 +- .../org-chef-fine-cooking.el | 81 + .../org-chef-genius-kitchen.el | 14 +- .../org-chef-marmiton.el | 19 +- .../org-chef-martha-stewart.el | 2 +- .../org-chef-nytimes.el | 2 +- .../org-chef-pkg.el | 2 +- .../org-chef-reluctant-gourmet.el | 2 +- .../org-chef-saveur.el | 2 +- .../org-chef-serious-eats.el | 7 +- .../org-chef-simply-recipes.el | 2 +- .../org-chef-steamy-kitchen.el | 2 +- elpa/org-chef-20191017.2015/org-chef-taste.el | 103 + .../org-chef-utils.el | 13 + .../org-chef-wordpress.el | 4 +- .../org-chef-xiachufang.el | 118 + .../org-chef.el | 21 +- elpa/org-mime-20181023.2314/org-mime-pkg.el | 2 - .../org-mime-autoloads.el | 36 +- elpa/org-mime-20190805.57/org-mime-pkg.el | 2 + .../org-mime.el | 208 +- .../COPYING | 0 .../README_ELPA | 0 .../dir | 0 .../etc/ORG-NEWS | 0 .../etc/styles/OrgOdtContentTemplate.xml | 0 .../etc/styles/OrgOdtStyles.xml | 0 .../etc/styles/README | 0 .../ob-C.el | 0 .../ob-J.el | 0 .../ob-R.el | 0 .../ob-abc.el | 0 .../ob-arduino.el | 0 .../ob-asymptote.el | 0 .../ob-awk.el | 0 .../ob-calc.el | 0 .../ob-clojure-literate.el | 0 .../ob-clojure.el | 0 .../ob-comint.el | 0 .../ob-coq.el | 0 .../ob-core.el | 8 +- .../ob-csharp.el | 0 .../ob-css.el | 0 .../ob-ditaa.el | 0 .../ob-dot.el | 0 .../ob-ebnf.el | 0 .../ob-emacs-lisp.el | 0 .../ob-eukleides.el | 0 .../ob-eval.el | 0 .../ob-exp.el | 0 .../ob-fomus.el | 0 .../ob-forth.el | 0 .../ob-fortran.el | 0 .../ob-gnuplot.el | 0 .../ob-groovy.el | 0 .../ob-haskell.el | 0 .../ob-hledger.el | 0 .../ob-io.el | 0 .../ob-java.el | 0 .../ob-js.el | 0 .../ob-julia.el | 0 .../ob-keys.el | 0 .../ob-latex.el | 0 .../ob-ledger.el | 0 .../ob-lilypond.el | 0 .../ob-lisp.el | 0 .../ob-lob.el | 0 .../ob-lua.el | 0 .../ob-makefile.el | 0 .../ob-mathematica.el | 0 .../ob-mathomatic.el | 0 .../ob-matlab.el | 0 .../ob-maxima.el | 0 .../ob-mscgen.el | 0 .../ob-ocaml.el | 0 .../ob-octave.el | 0 .../ob-org.el | 0 .../ob-oz.el | 0 .../ob-perl.el | 0 .../ob-php.el | 0 .../ob-picolisp.el | 0 .../ob-plantuml.el | 0 .../ob-processing.el | 0 .../ob-python.el | 0 .../ob-redis.el | 0 .../ob-ref.el | 0 .../ob-ruby.el | 0 .../ob-sass.el | 0 .../ob-scheme.el | 2 +- .../ob-sclang.el | 0 .../ob-screen.el | 0 .../ob-sed.el | 0 .../ob-shell.el | 8 +- .../ob-shen.el | 0 .../ob-smiles.el | 0 .../ob-spice.el | 0 .../ob-sql.el | 0 .../ob-sqlite.el | 0 .../ob-stan.el | 0 .../ob-stata.el | 0 .../ob-table.el | 0 .../ob-tangle.el | 0 .../ob-tcl.el | 0 .../ob-vala.el | 0 .../ob-vbnet.el | 0 .../ob.el | 0 .../org | 0 .../org-agenda.el | 0 .../org-annotate-file.el | 0 .../org-archive.el | 0 .../org-attach-embedded-images.el | 0 .../org-attach.el | 0 .../org-bbdb.el | 0 .../org-bibtex-extras.el | 0 .../org-bibtex.el | 0 .../org-bookmark.el | 0 .../org-capture.el | 0 .../org-checklist.el | 0 .../org-choose.el | 0 .../org-clock.el | 2 +- .../org-collector.el | 0 .../org-colview.el | 0 .../org-compat.el | 0 .../org-contacts.el | 0 .../org-contribdir.el | 0 .../org-crypt.el | 0 .../org-ctags.el | 0 .../org-datetree.el | 0 .../org-depend.el | 0 .../org-docview.el | 0 .../org-drill.el | 0 .../org-duration.el | 0 .../org-effectiveness.el | 0 .../org-eldoc.el | 0 .../org-element.el | 0 .../org-elisp-symbol.el | 0 .../org-entities.el | 0 .../org-eshell.el | 0 .../org-eval-light.el | 0 .../org-eval.el | 0 .../org-eww.el | 0 .../org-expiry.el | 0 .../org-faces.el | 0 .../org-feed.el | 0 .../org-footnote.el | 0 .../org-git-link.el | 0 .../org-gnus.el | 0 .../org-goto.el | 0 .../org-habit.el | 0 .../org-id.el | 0 .../org-indent.el | 0 .../org-info.el | 0 .../org-inlinetask.el | 0 .../org-install.el | 0 .../org-interactive-query.el | 0 .../org-invoice.el | 0 .../org-irc.el | 0 .../org-learn.el | 0 .../org-license.el | 0 .../org-link-edit.el | 0 .../org-lint.el | 0 .../org-list.el | 0 .../org-loaddefs.el | 63 +- .../org-mac-iCal.el | 0 .../org-mac-link.el | 0 .../org-macro.el | 0 .../org-macs.el | 0 .../org-mairix.el | 0 .../org-man.el | 0 .../org-mew.el | 0 .../org-mhe.el | 0 .../org-mobile.el | 0 .../org-mouse.el | 0 .../org-notify.el | 0 .../org-notmuch.el | 0 .../org-panel.el | 0 .../org-passwords.el | 0 .../org-pcomplete.el | 0 .../org-plot.el | 0 .../org-plus-contrib-autoloads.el | 1272 +----- .../org-plus-contrib-pkg.el | 2 +- .../org-protocol.el | 0 .../org-registry.el | 0 .../org-rmail.el | 0 .../org-screen.el | 0 .../org-screenshot.el | 0 .../org-secretary.el | 0 .../org-src.el | 0 .../org-static-mathjax.el | 0 .../org-sudoku.el | 0 .../org-table.el | 0 .../org-tempo.el | 0 .../org-timer.el | 0 .../org-toc.el | 0 .../org-track.el | 0 .../org-velocity.el | 0 .../org-version.el | 2 +- .../org-vm.el | 0 .../org-w3m.el | 0 .../org-wikinodes.el | 0 .../org-wl.el | 0 .../org.el | 0 .../orgcard.pdf | Bin 118708 -> 118708 bytes .../orgtbl-sqlinsert.el | 0 .../ox-ascii.el | 0 .../ox-beamer.el | 0 .../ox-bibtex.el | 0 .../ox-confluence.el | 0 .../ox-deck.el | 0 .../ox-extra.el | 0 .../ox-freemind.el | 0 .../ox-groff.el | 0 .../ox-html.el | 0 .../ox-icalendar.el | 0 .../ox-koma-letter.el | 0 .../ox-latex.el | 0 .../ox-man.el | 0 .../ox-md.el | 0 .../ox-odt.el | 0 .../ox-org.el | 0 .../ox-publish.el | 0 .../ox-rss.el | 0 .../ox-s5.el | 0 .../ox-taskjuggler.el | 0 .../ox-texinfo.el | 0 .../ox.el | 2 +- .../citeproc/csl/acs-nano.csl | 214 + .../citeproc/csl/author-year.el | 92 + .../citeproc/csl/unsrt-footnote.el | 86 + .../citeproc/csl/unsrt-paren.el | 107 + .../citeproc/csl/unsrt.el | 111 + .../citeproc/readme-author-year.org | 92 + .../citeproc/readme-unsrt.org | 93 + elpa/org-ref-20191023.117/citeproc/readme.bib | 203 + elpa/org-ref-20191023.117/citeproc/readme.org | 1676 +++++++ elpa/org-ref-20191023.117/doi-utils.el | 1522 +++++++ elpa/org-ref-20191023.117/nist-webbook.el | 42 + elpa/org-ref-20191023.117/org-ref-arxiv.el | 237 + .../org-ref-20191023.117/org-ref-autoloads.el | 1047 +++++ elpa/org-ref-20191023.117/org-ref-bibtex.el | 1380 ++++++ elpa/org-ref-20191023.117/org-ref-citeproc.el | 919 ++++ elpa/org-ref-20191023.117/org-ref-core.el | 4039 +++++++++++++++++ elpa/org-ref-20191023.117/org-ref-glossary.el | 496 ++ .../org-ref-helm-bibtex.el | 736 +++ .../org-ref-20191023.117/org-ref-helm-cite.el | 770 ++++ elpa/org-ref-20191023.117/org-ref-helm.el | 474 ++ elpa/org-ref-20191023.117/org-ref-isbn.el | 192 + elpa/org-ref-20191023.117/org-ref-ivy-cite.el | 562 +++ elpa/org-ref-20191023.117/org-ref-ivy.el | 35 + elpa/org-ref-20191023.117/org-ref-latex.el | 147 + elpa/org-ref-20191023.117/org-ref-pdf.el | 282 ++ elpa/org-ref-20191023.117/org-ref-pgk.el | 16 + elpa/org-ref-20191023.117/org-ref-pkg.el | 22 + elpa/org-ref-20191023.117/org-ref-pubmed.el | 292 ++ elpa/org-ref-20191023.117/org-ref-reftex.el | 274 ++ elpa/org-ref-20191023.117/org-ref-sci-id.el | 54 + .../org-ref-20191023.117/org-ref-scifinder.el | 35 + elpa/org-ref-20191023.117/org-ref-scopus.el | 222 + .../org-ref-20191023.117/org-ref-url-utils.el | 408 ++ elpa/org-ref-20191023.117/org-ref-utils.el | 920 ++++ elpa/org-ref-20191023.117/org-ref-worldcat.el | 20 + elpa/org-ref-20191023.117/org-ref-wos.el | 107 + elpa/org-ref-20191023.117/org-ref.bib | 332 ++ elpa/org-ref-20191023.117/org-ref.el | 45 + elpa/org-ref-20191023.117/org-ref.org | 989 ++++ elpa/org-ref-20191023.117/x2bib.el | 132 + elpa/org-ref-readme.txt | 4 + .../org-sticky-header-pkg.el | 2 - .../org-sticky-header-autoloads.el | 10 +- .../org-sticky-header-pkg.el | 2 + .../org-sticky-header.el | 72 +- .../org-tree-slide-pkg.el | 2 - .../org-tree-slide-autoloads.el | 12 +- .../org-tree-slide-pkg.el | 2 + .../org-tree-slide.el | 46 +- init.el | 4 +- 434 files changed, 20750 insertions(+), 2765 deletions(-) delete mode 100644 elpa/ob-async-20190122.31/ob-async-pkg.el rename elpa/{ob-async-20190122.31 => ob-async-20190916.1537}/ob-async-autoloads.el (79%) create mode 100644 elpa/ob-async-20190916.1537/ob-async-pkg.el rename elpa/{ob-async-20190122.31 => ob-async-20190916.1537}/ob-async.el (72%) delete mode 100644 elpa/ob-cfengine3-20180102.1812/ob-cfengine3-autoloads.el delete mode 100644 elpa/ob-cfengine3-20180102.1812/ob-cfengine3-pkg.el delete mode 100644 elpa/ob-cfengine3-20180102.1812/ob-cfengine3.el create mode 100644 elpa/ob-cfengine3-20191011.1721/ob-cfengine3-autoloads.el create mode 100644 elpa/ob-cfengine3-20191011.1721/ob-cfengine3-pkg.el create mode 100644 elpa/ob-cfengine3-20191011.1721/ob-cfengine3.el delete mode 100644 elpa/ob-restclient-20180904.709/ob-restclient-pkg.el rename elpa/{ob-restclient-20180904.709 => ob-restclient-20190626.1824}/ob-restclient-autoloads.el (60%) create mode 100644 elpa/ob-restclient-20190626.1824/ob-restclient-pkg.el rename elpa/{ob-restclient-20180904.709 => ob-restclient-20190626.1824}/ob-restclient.el (78%) delete mode 100644 elpa/ob-tmux-20180831.1017/ob-tmux-autoloads.el create mode 100644 elpa/ob-tmux-20190708.1202/ob-tmux-autoloads.el rename elpa/{ob-tmux-20180831.1017 => ob-tmux-20190708.1202}/ob-tmux-pkg.el (66%) rename elpa/{ob-tmux-20180831.1017 => ob-tmux-20190708.1202}/ob-tmux.el (79%) rename elpa/{org-20190930 => org-20191028}/COPYING (100%) rename elpa/{org-20190930 => org-20191028}/README_ELPA (100%) rename elpa/{org-20190930 => org-20191028}/dir (100%) rename elpa/{org-20190930 => org-20191028}/etc/ORG-NEWS (100%) rename elpa/{org-20190930 => org-20191028}/etc/styles/OrgOdtContentTemplate.xml (100%) rename elpa/{org-20190930 => org-20191028}/etc/styles/OrgOdtStyles.xml (100%) rename elpa/{org-20190930 => org-20191028}/etc/styles/README (100%) rename elpa/{org-20190930 => org-20191028}/ob-C.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-J.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-R.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-abc.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-asymptote.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-awk.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-calc.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-clojure.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-comint.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-coq.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-core.el (99%) rename elpa/{org-20190930 => org-20191028}/ob-css.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-ditaa.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-dot.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-ebnf.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-emacs-lisp.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-eval.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-exp.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-forth.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-fortran.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-gnuplot.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-groovy.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-haskell.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-hledger.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-io.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-java.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-js.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-keys.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-latex.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-ledger.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-lilypond.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-lisp.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-lob.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-lua.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-makefile.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-matlab.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-maxima.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-mscgen.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-ocaml.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-octave.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-org.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-perl.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-picolisp.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-plantuml.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-processing.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-python.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-ref.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-ruby.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-sass.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-scheme.el (99%) rename elpa/{org-20190930 => org-20191028}/ob-screen.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-sed.el (100%) rename elpa/{org-plus-contrib-20190930 => org-20191028}/ob-shell.el (97%) rename elpa/{org-20190930 => org-20191028}/ob-shen.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-sql.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-sqlite.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-stan.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-table.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-tangle.el (100%) rename elpa/{org-20190930 => org-20191028}/ob-vala.el (100%) rename elpa/{org-20190930 => org-20191028}/ob.el (100%) rename elpa/{org-20190930 => org-20191028}/org (100%) rename elpa/{org-20190930 => org-20191028}/org-agenda.el (100%) rename elpa/{org-20190930 => org-20191028}/org-archive.el (100%) rename elpa/{org-20190930 => org-20191028}/org-attach.el (100%) rename elpa/{org-20190930 => org-20191028}/org-autoloads.el (54%) rename elpa/{org-20190930 => org-20191028}/org-bbdb.el (100%) rename elpa/{org-20190930 => org-20191028}/org-bibtex.el (100%) rename elpa/{org-20190930 => org-20191028}/org-capture.el (100%) rename elpa/{org-20190930 => org-20191028}/org-clock.el (99%) rename elpa/{org-20190930 => org-20191028}/org-colview.el (100%) rename elpa/{org-20190930 => org-20191028}/org-compat.el (100%) rename elpa/{org-20190930 => org-20191028}/org-crypt.el (100%) rename elpa/{org-20190930 => org-20191028}/org-ctags.el (100%) rename elpa/{org-20190930 => org-20191028}/org-datetree.el (100%) rename elpa/{org-20190930 => org-20191028}/org-docview.el (100%) rename elpa/{org-20190930 => org-20191028}/org-duration.el (100%) rename elpa/{org-20190930 => org-20191028}/org-element.el (100%) rename elpa/{org-20190930 => org-20191028}/org-entities.el (100%) rename elpa/{org-20190930 => org-20191028}/org-eshell.el (100%) rename elpa/{org-20190930 => org-20191028}/org-eww.el (100%) rename elpa/{org-20190930 => org-20191028}/org-faces.el (100%) rename elpa/{org-20190930 => org-20191028}/org-feed.el (100%) rename elpa/{org-20190930 => org-20191028}/org-footnote.el (100%) rename elpa/{org-20190930 => org-20191028}/org-gnus.el (100%) rename elpa/{org-20190930 => org-20191028}/org-goto.el (100%) rename elpa/{org-20190930 => org-20191028}/org-habit.el (100%) rename elpa/{org-20190930 => org-20191028}/org-id.el (100%) rename elpa/{org-20190930 => org-20191028}/org-indent.el (100%) rename elpa/{org-20190930 => org-20191028}/org-info.el (100%) rename elpa/{org-20190930 => org-20191028}/org-inlinetask.el (100%) rename elpa/{org-20190930 => org-20191028}/org-install.el (100%) rename elpa/{org-20190930 => org-20191028}/org-irc.el (100%) rename elpa/{org-20190930 => org-20191028}/org-lint.el (100%) rename elpa/{org-20190930 => org-20191028}/org-list.el (100%) rename elpa/{org-20190930 => org-20191028}/org-loaddefs.el (98%) rename elpa/{org-20190930 => org-20191028}/org-macro.el (100%) rename elpa/{org-20190930 => org-20191028}/org-macs.el (100%) rename elpa/{org-20190930 => org-20191028}/org-mhe.el (100%) rename elpa/{org-20190930 => org-20191028}/org-mobile.el (100%) rename elpa/{org-20190930 => org-20191028}/org-mouse.el (100%) rename elpa/{org-20190930 => org-20191028}/org-pcomplete.el (100%) rename elpa/{org-20190930 => org-20191028}/org-pkg.el (53%) rename elpa/{org-20190930 => org-20191028}/org-plot.el (100%) rename elpa/{org-20190930 => org-20191028}/org-protocol.el (100%) rename elpa/{org-20190930 => org-20191028}/org-rmail.el (100%) rename elpa/{org-20190930 => org-20191028}/org-src.el (100%) rename elpa/{org-20190930 => org-20191028}/org-table.el (100%) rename elpa/{org-20190930 => org-20191028}/org-tempo.el (100%) rename elpa/{org-20190930 => org-20191028}/org-timer.el (100%) rename elpa/{org-20190930 => org-20191028}/org-version.el (92%) rename elpa/{org-20190930 => org-20191028}/org-w3m.el (100%) rename elpa/{org-20190930 => org-20191028}/org.el (100%) rename elpa/{org-plus-contrib-20190930 => org-20191028}/orgcard.pdf (99%) rename elpa/{org-20190930 => org-20191028}/ox-ascii.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-beamer.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-html.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-icalendar.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-latex.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-man.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-md.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-odt.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-org.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-publish.el (100%) rename elpa/{org-20190930 => org-20191028}/ox-texinfo.el (100%) rename elpa/{org-20190930 => org-20191028}/ox.el (99%) delete mode 100644 elpa/org-chef-20181202.2221/org-chef-autoloads.el delete mode 100644 elpa/org-chef-20181202.2221/org-chef-budget-bytes.el create mode 100644 elpa/org-chef-20191017.2015/org-chef-24kitchen.el rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-all-recipes.el (98%) create mode 100644 elpa/org-chef-20191017.2015/org-chef-autoloads.el rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-chef-koch.el (82%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-cultures-for-health.el (98%) create mode 100644 elpa/org-chef-20191017.2015/org-chef-fine-cooking.el rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-genius-kitchen.el (85%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-marmiton.el (87%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-martha-stewart.el (98%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-nytimes.el (98%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-pkg.el (84%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-reluctant-gourmet.el (98%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-saveur.el (98%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-serious-eats.el (95%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-simply-recipes.el (98%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-steamy-kitchen.el (98%) create mode 100644 elpa/org-chef-20191017.2015/org-chef-taste.el rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-utils.el (85%) rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef-wordpress.el (98%) create mode 100644 elpa/org-chef-20191017.2015/org-chef-xiachufang.el rename elpa/{org-chef-20181202.2221 => org-chef-20191017.2015}/org-chef.el (86%) delete mode 100644 elpa/org-mime-20181023.2314/org-mime-pkg.el rename elpa/{org-mime-20181023.2314 => org-mime-20190805.57}/org-mime-autoloads.el (58%) create mode 100644 elpa/org-mime-20190805.57/org-mime-pkg.el rename elpa/{org-mime-20181023.2314 => org-mime-20190805.57}/org-mime.el (81%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/COPYING (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/README_ELPA (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/dir (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/etc/ORG-NEWS (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/etc/styles/OrgOdtContentTemplate.xml (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/etc/styles/OrgOdtStyles.xml (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/etc/styles/README (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-C.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-J.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-R.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-abc.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-arduino.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-asymptote.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-awk.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-calc.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-clojure-literate.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-clojure.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-comint.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-coq.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-core.el (99%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-csharp.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-css.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-ditaa.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-dot.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-ebnf.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-emacs-lisp.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-eukleides.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-eval.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-exp.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-fomus.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-forth.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-fortran.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-gnuplot.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-groovy.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-haskell.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-hledger.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-io.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-java.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-js.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-julia.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-keys.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-latex.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-ledger.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-lilypond.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-lisp.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-lob.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-lua.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-makefile.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-mathematica.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-mathomatic.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-matlab.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-maxima.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-mscgen.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-ocaml.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-octave.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-org.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-oz.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-perl.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-php.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-picolisp.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-plantuml.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-processing.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-python.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-redis.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-ref.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-ruby.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-sass.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-scheme.el (99%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-sclang.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-screen.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-sed.el (100%) rename elpa/{org-20190930 => org-plus-contrib-20191028}/ob-shell.el (97%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-shen.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-smiles.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-spice.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-sql.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-sqlite.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-stan.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-stata.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-table.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-tangle.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-tcl.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-vala.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob-vbnet.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ob.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-agenda.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-annotate-file.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-archive.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-attach-embedded-images.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-attach.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-bbdb.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-bibtex-extras.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-bibtex.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-bookmark.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-capture.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-checklist.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-choose.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-clock.el (99%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-collector.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-colview.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-compat.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-contacts.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-contribdir.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-crypt.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-ctags.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-datetree.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-depend.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-docview.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-drill.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-duration.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-effectiveness.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-eldoc.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-element.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-elisp-symbol.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-entities.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-eshell.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-eval-light.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-eval.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-eww.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-expiry.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-faces.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-feed.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-footnote.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-git-link.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-gnus.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-goto.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-habit.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-id.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-indent.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-info.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-inlinetask.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-install.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-interactive-query.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-invoice.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-irc.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-learn.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-license.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-link-edit.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-lint.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-list.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-loaddefs.el (98%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-mac-iCal.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-mac-link.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-macro.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-macs.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-mairix.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-man.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-mew.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-mhe.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-mobile.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-mouse.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-notify.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-notmuch.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-panel.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-passwords.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-pcomplete.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-plot.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-plus-contrib-autoloads.el (56%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-plus-contrib-pkg.el (57%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-protocol.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-registry.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-rmail.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-screen.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-screenshot.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-secretary.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-src.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-static-mathjax.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-sudoku.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-table.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-tempo.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-timer.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-toc.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-track.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-velocity.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-version.el (92%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-vm.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-w3m.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-wikinodes.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org-wl.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/org.el (100%) rename elpa/{org-20190930 => org-plus-contrib-20191028}/orgcard.pdf (99%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/orgtbl-sqlinsert.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-ascii.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-beamer.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-bibtex.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-confluence.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-deck.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-extra.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-freemind.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-groff.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-html.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-icalendar.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-koma-letter.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-latex.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-man.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-md.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-odt.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-org.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-publish.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-rss.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-s5.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-taskjuggler.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox-texinfo.el (100%) rename elpa/{org-plus-contrib-20190930 => org-plus-contrib-20191028}/ox.el (99%) create mode 100644 elpa/org-ref-20191023.117/citeproc/csl/acs-nano.csl create mode 100644 elpa/org-ref-20191023.117/citeproc/csl/author-year.el create mode 100644 elpa/org-ref-20191023.117/citeproc/csl/unsrt-footnote.el create mode 100644 elpa/org-ref-20191023.117/citeproc/csl/unsrt-paren.el create mode 100644 elpa/org-ref-20191023.117/citeproc/csl/unsrt.el create mode 100644 elpa/org-ref-20191023.117/citeproc/readme-author-year.org create mode 100644 elpa/org-ref-20191023.117/citeproc/readme-unsrt.org create mode 100644 elpa/org-ref-20191023.117/citeproc/readme.bib create mode 100644 elpa/org-ref-20191023.117/citeproc/readme.org create mode 100644 elpa/org-ref-20191023.117/doi-utils.el create mode 100644 elpa/org-ref-20191023.117/nist-webbook.el create mode 100644 elpa/org-ref-20191023.117/org-ref-arxiv.el create mode 100644 elpa/org-ref-20191023.117/org-ref-autoloads.el create mode 100644 elpa/org-ref-20191023.117/org-ref-bibtex.el create mode 100644 elpa/org-ref-20191023.117/org-ref-citeproc.el create mode 100644 elpa/org-ref-20191023.117/org-ref-core.el create mode 100644 elpa/org-ref-20191023.117/org-ref-glossary.el create mode 100644 elpa/org-ref-20191023.117/org-ref-helm-bibtex.el create mode 100644 elpa/org-ref-20191023.117/org-ref-helm-cite.el create mode 100644 elpa/org-ref-20191023.117/org-ref-helm.el create mode 100644 elpa/org-ref-20191023.117/org-ref-isbn.el create mode 100644 elpa/org-ref-20191023.117/org-ref-ivy-cite.el create mode 100644 elpa/org-ref-20191023.117/org-ref-ivy.el create mode 100644 elpa/org-ref-20191023.117/org-ref-latex.el create mode 100644 elpa/org-ref-20191023.117/org-ref-pdf.el create mode 100644 elpa/org-ref-20191023.117/org-ref-pgk.el create mode 100644 elpa/org-ref-20191023.117/org-ref-pkg.el create mode 100644 elpa/org-ref-20191023.117/org-ref-pubmed.el create mode 100644 elpa/org-ref-20191023.117/org-ref-reftex.el create mode 100644 elpa/org-ref-20191023.117/org-ref-sci-id.el create mode 100644 elpa/org-ref-20191023.117/org-ref-scifinder.el create mode 100644 elpa/org-ref-20191023.117/org-ref-scopus.el create mode 100644 elpa/org-ref-20191023.117/org-ref-url-utils.el create mode 100644 elpa/org-ref-20191023.117/org-ref-utils.el create mode 100644 elpa/org-ref-20191023.117/org-ref-worldcat.el create mode 100644 elpa/org-ref-20191023.117/org-ref-wos.el create mode 100644 elpa/org-ref-20191023.117/org-ref.bib create mode 100644 elpa/org-ref-20191023.117/org-ref.el create mode 100644 elpa/org-ref-20191023.117/org-ref.org create mode 100644 elpa/org-ref-20191023.117/x2bib.el create mode 100644 elpa/org-ref-readme.txt delete mode 100644 elpa/org-sticky-header-20170423.435/org-sticky-header-pkg.el rename elpa/{org-sticky-header-20170423.435 => org-sticky-header-20190406.2313}/org-sticky-header-autoloads.el (69%) create mode 100644 elpa/org-sticky-header-20190406.2313/org-sticky-header-pkg.el rename elpa/{org-sticky-header-20170423.435 => org-sticky-header-20190406.2313}/org-sticky-header.el (80%) delete mode 100644 elpa/org-tree-slide-20181226.947/org-tree-slide-pkg.el rename elpa/{org-tree-slide-20181226.947 => org-tree-slide-20190729.1550}/org-tree-slide-autoloads.el (92%) create mode 100644 elpa/org-tree-slide-20190729.1550/org-tree-slide-pkg.el rename elpa/{org-tree-slide-20181226.947 => org-tree-slide-20190729.1550}/org-tree-slide.el (96%) diff --git a/bba.org b/bba.org index 8a033764..86c15dce 100644 --- a/bba.org +++ b/bba.org @@ -874,10 +874,10 @@ With [[https://github.com/fniessen/org-html-themes.git][org html themes]] it's e Some extra functionality from the org package repository. -#+BEGIN_SRC emacs-lisp :tangle yes +#+BEGIN_SRC emacs-lisp :tangle no (if (>= emacs-major-version 24) (progn - (add-to-list 'load-path "~/.emacs.d/elpa/org-plus-contrib-20190930" t) + (add-to-list 'load-path "~/.emacs.d/elpa/org-plus-contrib-20191028" t) )) #+END_SRC @@ -1923,7 +1923,7 @@ Use =C-c M= to send a multipart email with .org as text and exported html. #+BEGIN_SRC emacs-lisp :tangle yes - (load-file "~/.emacs.d/elpa/org-mime-20181023.2314/org-mime.el") + (load-file "~/.emacs.d/elpa/org-mime-20190805.57/org-mime.el") (add-hook 'org-mode-hook (lambda() (define-key org-mode-map "\C-c\S-m" 'org-mime-org-buffer-htmlize))) @@ -2018,7 +2018,7 @@ file. [2017-04-26 Wed 13:09] #+BEGIN_SRC emacs-lisp :tangle yes - (add-to-list 'load-path "~/.emacs.d/elpa/org-sticky-header-20170423.435" t) + (add-to-list 'load-path "~/.emacs.d/elpa/org-sticky-header-20190406.2313" t) (add-hook 'org-mode-hook (lambda ()(org-sticky-header-mode 1)) ) diff --git a/elpa/ob-async-20190122.31/ob-async-pkg.el b/elpa/ob-async-20190122.31/ob-async-pkg.el deleted file mode 100644 index 2979a721..00000000 --- a/elpa/ob-async-20190122.31/ob-async-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "ob-async" "20190122.31" "Asynchronous org-babel src block execution" '((async "1.9") (org "9.0.1") (emacs "24.4") (dash "2.14.1")) :commit "f52447d91dcfe08e870e2a9d1e03e0c45a7237a3" :keywords '("tools") :authors '(("Andrew Stahlman" . "andrewstahlman@gmail.com")) :maintainer '("Andrew Stahlman" . "andrewstahlman@gmail.com") :url "https://github.com/astahlman/ob-async") diff --git a/elpa/ob-async-20190122.31/ob-async-autoloads.el b/elpa/ob-async-20190916.1537/ob-async-autoloads.el similarity index 79% rename from elpa/ob-async-20190122.31/ob-async-autoloads.el rename to elpa/ob-async-20190916.1537/ob-async-autoloads.el index 67a4b63e..fb3fdb4e 100644 --- a/elpa/ob-async-20190122.31/ob-async-autoloads.el +++ b/elpa/ob-async-20190916.1537/ob-async-autoloads.el @@ -1,12 +1,10 @@ ;;; ob-async-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "ob-async" "ob-async.el" (0 0 0 0)) +;;;### (autoloads nil "ob-async" "ob-async.el" (23994 46443 468144 +;;;;;; 950000)) ;;; Generated autoloads from ob-async.el (defalias 'org-babel-execute-src-block:async 'ob-async-org-babel-execute-src-block) @@ -33,14 +31,11 @@ block. \(fn &optional ORIG-FUN ARG INFO PARAMS)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-async" '("ob-async-"))) - ;;;*** ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; ob-async-autoloads.el ends here diff --git a/elpa/ob-async-20190916.1537/ob-async-pkg.el b/elpa/ob-async-20190916.1537/ob-async-pkg.el new file mode 100644 index 00000000..34c7c9b4 --- /dev/null +++ b/elpa/ob-async-20190916.1537/ob-async-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "ob-async" "20190916.1537" "Asynchronous org-babel src block execution" '((async "1.9") (org "9.0.1") (emacs "24.4") (dash "2.14.1")) :commit "80a30b96a007d419ece12c976a81804ede340311" :keywords '("tools") :authors '(("Andrew Stahlman" . "andrewstahlman@gmail.com")) :maintainer '("Andrew Stahlman" . "andrewstahlman@gmail.com") :url "https://github.com/astahlman/ob-async") diff --git a/elpa/ob-async-20190122.31/ob-async.el b/elpa/ob-async-20190916.1537/ob-async.el similarity index 72% rename from elpa/ob-async-20190122.31/ob-async.el rename to elpa/ob-async-20190916.1537/ob-async.el index 8a6f9d48..926f62fc 100644 --- a/elpa/ob-async-20190122.31/ob-async.el +++ b/elpa/ob-async-20190916.1537/ob-async.el @@ -5,7 +5,7 @@ ;; Author: Andrew Stahlman ;; Created: 10 Feb 2017 ;; Version: 0.1 -;; Package-Version: 20190122.31 +;; Package-Version: 20190916.1537 ;; Keywords: tools ;; Homepage: https://github.com/astahlman/ob-async @@ -108,7 +108,8 @@ block." (and (not arg) c (string= "yes" c)))) (new-hash (and cache (org-babel-sha1-hash info))) (old-hash (and cache (org-babel-current-result-hash))) - (current-cache (and new-hash (equal new-hash old-hash)))) + (current-cache (and new-hash (equal new-hash old-hash))) + (result-params (cdr (assq :result-params params)))) (cond (current-cache (save-excursion ;Return cached result. @@ -120,9 +121,10 @@ block." result))) ((org-babel-confirm-evaluate info) ;; Insert a GUID as a placeholder in our RESULTS block - (org-babel-insert-result placeholder '("replace")) + (when (not (or (member "none" result-params) + (member "silent" result-params))) + (org-babel-insert-result placeholder '("replace"))) (let* ((lang (nth 0 info)) - (result-params (cdr (assq :result-params params))) ;; Expand noweb references in BODY and remove any ;; coderef. (body @@ -159,37 +161,42 @@ block." (org-babel-do-load-languages 'org-babel-load-languages ',org-babel-load-languages) (let ((default-directory ,default-directory)) (,cmd ,body ',params))) - (if (member "none" ',result-params) - (progn (message "result silenced") - 'ignore) - `(lambda (result) - (with-current-buffer ,(current-buffer) - (let ((default-directory ,default-directory)) - (save-excursion - (goto-char ,src-block-marker) - (let ((file (cdr (assq :file ',params)))) - ;; If non-empty result and :file then write to :file. - (when file - (when result - (with-temp-file file - (insert (org-babel-format-result - result (cdr (assq :sep ',params)))))) - (setq result file)) - ;; Possibly perform post process provided its - ;; appropriate. Dynamically bind "*this*" to the - ;; actual results of the block. - (let ((post (cdr (assq :post ',params)))) - (when post - (let ((*this* (if (not file) result - (org-babel-result-to-file - file - (let ((desc (assq :file-desc ',params))) - (and desc (or (cdr desc) result))))))) - (setq result (org-babel-ref-resolve post)) - (when file - (setq result-params (remove "file" ',result-params)))))) - (org-babel-insert-result result ',result-params ',info ',new-hash ',lang) - (run-hooks 'org-babel-after-execute-hook))))))))))))))))))) + `(lambda (result) + (with-current-buffer ,(current-buffer) + (let ((default-directory ,default-directory)) + (save-excursion + (cond + ((member "none" ',result-params) + (message "result silenced")) + ((member "silent" ',result-params) + (message (replace-regexp-in-string "%" "%%" (format "%S" result)))) + (t + (goto-char ,src-block-marker) + (let ((file (cdr (assq :file ',params)))) + (when file + ;; when result type is link, don't write result content to file. + (unless (member "link" ',result-params) + ;; If non-empty result and :file then write to :file. + (when result + (with-temp-file file + (insert (org-babel-format-result + result (cdr (assq :sep ',params))))))) + (setq result file)) + ;; Possibly perform post process provided its + ;; appropriate. Dynamically bind "*this*" to the + ;; actual results of the block. + (let ((post (cdr (assq :post ',params)))) + (when post + (let ((*this* (if (not file) result + (org-babel-result-to-file + file + (let ((desc (assq :file-desc ',params))) + (and desc (or (cdr desc) result))))))) + (setq result (org-babel-ref-resolve post)) + (when file + (setq result-params (remove "file" ',result-params)))))) + (org-babel-insert-result result ',result-params ',info ',new-hash ',lang)))) + (run-hooks 'org-babel-after-execute-hook))))))))))))))))) (defun ob-async--generate-uuid () "Generate a 32 character UUID." diff --git a/elpa/ob-cfengine3-20180102.1812/ob-cfengine3-autoloads.el b/elpa/ob-cfengine3-20180102.1812/ob-cfengine3-autoloads.el deleted file mode 100644 index babc2b37..00000000 --- a/elpa/ob-cfengine3-20180102.1812/ob-cfengine3-autoloads.el +++ /dev/null @@ -1,22 +0,0 @@ -;;; ob-cfengine3-autoloads.el --- automatically extracted autoloads -;; -;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - - -;;;### (autoloads nil "ob-cfengine3" "ob-cfengine3.el" (0 0 0 0)) -;;; Generated autoloads from ob-cfengine3.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-cfengine3" '("ob-cfengine3-" "org-babel-execute:cfengine3"))) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; coding: utf-8 -;; End: -;;; ob-cfengine3-autoloads.el ends here diff --git a/elpa/ob-cfengine3-20180102.1812/ob-cfengine3-pkg.el b/elpa/ob-cfengine3-20180102.1812/ob-cfengine3-pkg.el deleted file mode 100644 index 90efdc18..00000000 --- a/elpa/ob-cfengine3-20180102.1812/ob-cfengine3-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "ob-cfengine3" "20180102.1812" "Org Babel functions for CFEngine 3" 'nil :commit "93ebcfceec3734f4bd187ae123686187d66fd401" :keywords '("tools" "convenience") :authors '(("Nick Anderson" . "nick@cmdln.org")) :maintainer '("Nick Anderson" . "nick@cmdln.org") :url "https://github.com/nickanderson/ob-cfengine3") diff --git a/elpa/ob-cfengine3-20180102.1812/ob-cfengine3.el b/elpa/ob-cfengine3-20180102.1812/ob-cfengine3.el deleted file mode 100644 index 34c60afb..00000000 --- a/elpa/ob-cfengine3-20180102.1812/ob-cfengine3.el +++ /dev/null @@ -1,105 +0,0 @@ -;;; ob-cfengine3.el --- Org Babel functions for CFEngine 3 - -;; Copyright (C) 2017 Nick Anderson - -;; Permission is hereby granted, free of charge, to any person obtaining a copy -;; of this software and associated documentation files (the "Software"), to deal -;; in the Software without restriction, including without limitation the rights -;; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -;; copies of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: -;; The above copyright notice and this permission notice shall be included in -;; all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -;; THE SOFTWARE. - -;; Author: Nick Anderson -;; Keywords: tools, convenience -;; Package-Version: 20180102.1812 -;; URL: https://github.com/nickanderson/ob-cfengine3 -;; Version: 0.0.2 - -;;; Commentary: -;; Execute CFEngine 3 policy inside org-mode src blocks. - -;;; Code: - -(defvar ob-cfengine3-command "cf-agent" - "Name of command to use for executing cfengine policy.") - -(defvar ob-cfengine3-command-options "" - "Option string that should be passed to the agent. -Note that --file will be appended to the options.") - -(defvar ob-cfengine3-file-control-stdlib "body file control{ inputs => { '$(sys.libdir)/stdlib.cf' };}\n" - "File control body to include the standard libriary from $(sys.libdir). -It is useful to inject into an example source block before execution.") - -(defconst ob-cfengine3-header-args-cfengine3 - '( - (no-lock . :any) - (debug . :any) - (verbose . :any) - (info . :any) - (include-stdlib . :any) - (define . :any) - (bundlesequence . :any)) - "CFEngine specific header arguments.") - -(defun org-babel-execute:cfengine3 (body params) - "Actuate a block of CFEngine 3 policy. -This function is called by `org-babel-execute-src-block'. - - A temporary file is constructed containing - `ob-cfengine3-file-control-stdlib and the BODY of the src - block. `ob-cfengine3-command' is used to execute the - temporary file." - - (let* ((temporary-file-directory ".") - (debug (cdr (assoc :debug params))) - (verbose (cdr (assoc :verbose params))) - (info (cdr (assoc :info params))) - (use-locks (cdr (assoc :use-locks params))) - (include-stdlib (not (string= "no" (cdr (assoc :include-stdlib params))))) - (define (cdr (assoc :define params))) - (bundlesequence (cdr (assoc :bundlesequence params))) - (tempfile (make-temp-file "cfengine3-"))) - (with-temp-file tempfile - (when include-stdlib (insert ob-cfengine3-file-control-stdlib)) - (insert body)) - (unwind-protect - (shell-command-to-string - (concat - ob-cfengine3-command - " " - (when bundlesequence (concat "--bundlesequence " bundlesequence )) - " " - (when define (concat "--define " define )) - " " - (unless use-locks "--no-lock ") - - ;; When info header arg is yes add --info to the command string and throw away the args - (when info (concat "--info ")) - " " - ;; When verbose header arg is yes add --verbose to the command string and throw away the args - (when verbose (concat "--verbose ")) - " " - ;; When debug header arg is yes add --debug with all log modules enabled to the command string and throw away the args - (when debug (concat "--debug --log-modules=all ")) - " " - ob-cfengine3-command-options - " " - (format " --file %s" (shell-quote-argument tempfile)))) - (delete-file tempfile)))) - -(add-to-list 'org-src-lang-modes '("cfengine3" . cfengine3)) -(add-to-list 'org-babel-tangle-lang-exts '("cfengine3" . "cf")) - -(provide 'ob-cfengine3) -;;; ob-cfengine3.el ends here diff --git a/elpa/ob-cfengine3-20191011.1721/ob-cfengine3-autoloads.el b/elpa/ob-cfengine3-20191011.1721/ob-cfengine3-autoloads.el new file mode 100644 index 00000000..731ff77f --- /dev/null +++ b/elpa/ob-cfengine3-20191011.1721/ob-cfengine3-autoloads.el @@ -0,0 +1,16 @@ +;;; ob-cfengine3-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +;;;### (autoloads nil nil ("ob-cfengine3.el") (23994 46443 18605 +;;;;;; 990000)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; ob-cfengine3-autoloads.el ends here diff --git a/elpa/ob-cfengine3-20191011.1721/ob-cfengine3-pkg.el b/elpa/ob-cfengine3-20191011.1721/ob-cfengine3-pkg.el new file mode 100644 index 00000000..298fe519 --- /dev/null +++ b/elpa/ob-cfengine3-20191011.1721/ob-cfengine3-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "ob-cfengine3" "20191011.1721" "Org Babel functions for CFEngine 3" 'nil :commit "195ba4694a0ec18d3fb89342e8e0988b382a5b1a" :keywords '("tools" "convenience") :authors '(("Nick Anderson" . "nick@cmdln.org")) :maintainer '("Nick Anderson" . "nick@cmdln.org") :url "https://github.com/nickanderson/ob-cfengine3") diff --git a/elpa/ob-cfengine3-20191011.1721/ob-cfengine3.el b/elpa/ob-cfengine3-20191011.1721/ob-cfengine3.el new file mode 100644 index 00000000..e64ee1f3 --- /dev/null +++ b/elpa/ob-cfengine3-20191011.1721/ob-cfengine3.el @@ -0,0 +1,220 @@ +;;; ob-cfengine3.el --- Org Babel functions for CFEngine 3 + +;; Copyright (C) 2017 Nick Anderson + +;; Permission is hereby granted, free of charge, to any person obtaining a copy +;; of this software and associated documentation files (the "Software"), to deal +;; in the Software without restriction, including without limitation the rights +;; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +;; copies of the Software, and to permit persons to whom the Software is +;; furnished to do so, subject to the following conditions: +;; The above copyright notice and this permission notice shall be included in +;; all copies or substantial portions of the Software. + +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +;; THE SOFTWARE. + +;; Author: Nick Anderson +;; Keywords: tools, convenience +;; Package-Version: 20191011.1721 +;; URL: https://github.com/nickanderson/ob-cfengine3 +;; Version: 0.0.7 + +;;; Commentary: +;; Execute CFEngine 3 policy inside org-mode src blocks. + +;;; Code: + +(defvar ob-cfengine3-command "cf-agent" + "Name of command to use for executing cfengine policy.") + +(defvar ob-cfengine3-command-options nil + "Option string that should be passed to the agent. +Note that --file will be appended to the options.") + +(defvar ob-cfengine3-file-control-stdlib "body file control{ inputs => { '$(sys.libdir)/stdlib.cf' };}\n" + "File control body to include the standard libriary from $(sys.libdir). +It is useful to inject into an example source block before execution.") + +(defvar ob-cfengine3-wrap-with-main-template "bundle agent __main__\n{\n%s\n}\n" + "Template to use to wrap the contents of the source block in a + 'main' bundle. Must contain exactly one '%s', where the body + will be inserted.") + +(defconst ob-cfengine3-header-args-cfengine3 + '( + (debug . :any) + (info . :any) + (verbose . :any) + (use-locks . :any) + (include-stdlib . :any) + (define . :any) + (bundlesequence . :any) + (log-level . :any) + (extra-opts . :any) + (command . :any) + (command-in-result . :any) + (command-in-result-command . :any) + (command-in-result-prompt . :any) + (command-in-result-filename . :any) + (command-in-result-multiline . :any) + (command-in-result-maxlen . :any) + (run-with-main . :any) + (short-options . :any)) + "CFEngine specific header arguments.") + +(defun ob-cfengine3-header-arg (pname params) + "Returns the value of header argument PNAME, extracted from PARAMS." + (cdr (assq pname params))) + +(defun ob-cfengine3-bool (str) + "Convert string to boolean. Strings `yes', `YES', `true', +`TRUE' and `t' are considered true, anything else is false." + (or (string-equal str "yes") + (string-equal str "true") + (string-equal str "t") + (string-equal str "YES") + (string-equal str "TRUE"))) + +(defun ob-cfengine3-bool-arg (pname params) + "Returns the boolean value of header argument PNAME, extracted from PARAMS." + (ob-cfengine3-bool (ob-cfengine3-header-arg pname params))) + +(defun ob-cfengine3-tangle-file (&optional tangle-value) + "Return the filename to use for tangling a CFEngine code block. + +TANGLE-VALUE must be the value of the `:tangle' header +argument. If `\"yes\"', returns the basename of the current +buffer with the `.cf' extension. If `\"no\"' or `nil', returns +`nil'. If any other string, it is returned as-is." + (cond + ((string= "yes" tangle-value) + (concat (file-name-sans-extension (buffer-file-name)) "." + (cdr (assoc "cfengine3" org-babel-tangle-lang-exts)))) + ((or (null tangle-value) (string= "no" tangle-value)) nil) + ((> (length tangle-value) 0) tangle-value))) + +(defun ob-cfengine3-option (long short flag) + "Returns either the LONG or the SHORT option, depending on the + value of FLAG (if FLAG is true, the short option is used)." + (if flag (concat "-" short) (concat "--" long))) + +(defun org-babel-execute:cfengine3 (body params) + "Actuate a block of CFEngine 3 policy. +This function is called by `org-babel-execute-src-block'. + + A temporary file is constructed containing + `ob-cfengine3-file-control-stdlib and the BODY of the src + block. `ob-cfengine3-command' is used to execute the + temporary file." + (let* ((temporary-file-directory ".") + (debug (ob-cfengine3-bool-arg :debug params)) + (info (ob-cfengine3-bool-arg :info params)) + (verbose (ob-cfengine3-bool-arg :verbose params)) + (use-locks (ob-cfengine3-bool-arg :use-locks params)) + (include-stdlib (ob-cfengine3-bool (or (ob-cfengine3-header-arg :include-stdlib params) "yes"))) + (define (ob-cfengine3-header-arg :define params)) + (bundlesequence (ob-cfengine3-header-arg :bundlesequence params)) + (log-level (ob-cfengine3-header-arg :log-level params)) + (extra-opts (ob-cfengine3-header-arg :extra-opts params)) + (command (or (ob-cfengine3-header-arg :command params) ob-cfengine3-command)) + (command-in-result (ob-cfengine3-bool-arg :command-in-result params)) + (command-in-result-command (or (ob-cfengine3-header-arg :command-in-result-command params) command)) + (command-in-result-prompt (or (ob-cfengine3-header-arg :command-in-result-prompt params) "# ")) + (command-in-result-multiline (ob-cfengine3-bool-arg :command-in-result-multiline params)) + (command-in-result-auto-ml (string-equal (ob-cfengine3-header-arg :command-in-result-multiline params) "auto")) + (command-in-result-maxlen (or (ob-cfengine3-header-arg :command-in-result-maxlen params) 80)) + (tempfile-dir (or (ob-cfengine3-header-arg :tmpdir params) ".")) + (tempfile (make-temp-file (concat tempfile-dir "/cfengine3-"))) + (command-in-result-filename (or (ob-cfengine3-header-arg :command-in-result-filename params) (ob-cfengine3-tangle-file (ob-cfengine3-header-arg :tangle params)) tempfile)) + (auto-main (ob-cfengine3-bool-arg :auto-main params)) + (run-with-main (or (ob-cfengine3-bool-arg :run-with-main params) auto-main)) + (short-opt (ob-cfengine3-bool-arg :short-options params)) + (command-in-result-prompt-plus-command (concat command-in-result-prompt command-in-result-command " "))) + (defun build-command-args (filename &optional sep) + (let ((sep (or sep " "))) + (mapconcat 'identity + (delq nil + (list (when bundlesequence (concat (ob-cfengine3-option "bundlesequence" "b" short-opt) " " bundlesequence)) + (when define (concat (ob-cfengine3-option "define" "D" short-opt) " " define)) + (unless use-locks (concat (ob-cfengine3-option "no-lock" "K" short-opt))) + (when info (concat (ob-cfengine3-option "inform" "I" short-opt))) + (when verbose (concat (ob-cfengine3-option "verbose" "v" short-opt))) + ;; When debug header arg is given, add --debug with + ;; all log modules enabled to the command string and + ;; throw away the args + (when debug (concat (ob-cfengine3-option "debug" "d" short-opt) " --log-modules=all")) + (when log-level (concat (ob-cfengine3-option "log-level" "g" short-opt) " " log-level)) + (when extra-opts extra-opts) + (when ob-cfengine3-command-options (concat ob-cfengine3-command-options)) + (when filename (format (concat (ob-cfengine3-option "file" "f" short-opt) " %s") (shell-quote-argument filename))))) + sep))) + (with-temp-file tempfile + (when include-stdlib (insert ob-cfengine3-file-control-stdlib)) + (if run-with-main + (insert (format ob-cfengine3-wrap-with-main-template body)) + (insert body))) + (unwind-protect + (let* ((multiline-sep (concat " \\\n" (make-string (length command-in-result-prompt-plus-command) ?\s))) + (single-line-cmd (build-command-args command-in-result-filename)) + (multi-line-cmd (build-command-args command-in-result-filename multiline-sep)) + (command-args + (if command-in-result-multiline multi-line-cmd + (if (and command-in-result-auto-ml (> (+ (length single-line-cmd) (length command-in-result-prompt-plus-command)) command-in-result-maxlen)) + multi-line-cmd single-line-cmd)))) + (concat + ;; When the :command-in-result header arg is specified, + ;; include the command line in the output. The prompt, + ;; command and filename to use (instead of the real ones) + ;; can be specified with the :command-in-result-prompt, + ;; :command-in-result-command and + ;; :command-in-result-filename args. + (when command-in-result + (concat command-in-result-prompt-plus-command + command-args + "\n")) + ;; Execute command and return output + (shell-command-to-string + (concat command " " (build-command-args tempfile))))) + (delete-file tempfile)))) + +(add-to-list 'org-src-lang-modes '("cfengine3" . cfengine3)) +(add-to-list 'org-babel-tangle-lang-exts '("cfengine3" . "cf")) + +(setq org-babel-default-header-args:cfengine3 + '((:exports . "both") + ;; I don't know how to make it use the identity format directly + ;;(:tangle-mode . 384) ;; (identity #o600) The standard default + (:tangle-mode . 448) ;; (identity #o700) Since we write the shebang, lets see how useful execution bit is + (:shebang . "#!/var/cfengine/bin/cf-agent -f-") + ;; By default, includ the standard library for exported files. To disable this set the :prologue header arg + (:prologue . "body file control\n{\n inputs => { '$(sys.libdir)/stdlib.cf' };\n}\n") + (:results . "output"))) + +(defun org-babel-expand-body:cfengine3 (body params) + "Expand a block of CFEngine 3 policy before tangling. +This function is called by `org-babel-tangle-single-block'. + + If the `:tangle-with-main'' or `:auto-main' header arguments + are `yes', `true' or `t', the BODY is formatted according to + the template in `ob-cfengine3-wrap-with-main-template`, + otherwise it is returned as-is." + (let* ((auto-main (ob-cfengine3-bool-arg :auto-main params)) + (tangle-with-main (or (ob-cfengine3-bool-arg :tangle-with-main params) auto-main)) + (pro (ob-cfengine3-header-arg :prologue params)) + (epi (ob-cfengine3-header-arg :epilogue params))) + (mapconcat #'identity + (append (when pro (list pro)) + (list (if tangle-with-main + (format ob-cfengine3-wrap-with-main-template body) + body)) + (when epi (list epi))) + "\n"))) + +(provide 'ob-cfengine3) +;;; ob-cfengine3.el ends here diff --git a/elpa/ob-restclient-20180904.709/ob-restclient-pkg.el b/elpa/ob-restclient-20180904.709/ob-restclient-pkg.el deleted file mode 100644 index f05a9437..00000000 --- a/elpa/ob-restclient-20180904.709/ob-restclient-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "ob-restclient" "20180904.709" "org-babel functions for restclient-mode" '((restclient "0")) :commit "00b2c5a6637ab6e504708612357ffb29b5416e4b" :keywords '("literate programming" "reproducible research") :authors '(("Alf Lervåg")) :maintainer '("Alf Lervåg") :url "http://orgmode.org") diff --git a/elpa/ob-restclient-20180904.709/ob-restclient-autoloads.el b/elpa/ob-restclient-20190626.1824/ob-restclient-autoloads.el similarity index 60% rename from elpa/ob-restclient-20180904.709/ob-restclient-autoloads.el rename to elpa/ob-restclient-20190626.1824/ob-restclient-autoloads.el index 747e57d9..a7233078 100644 --- a/elpa/ob-restclient-20180904.709/ob-restclient-autoloads.el +++ b/elpa/ob-restclient-20190626.1824/ob-restclient-autoloads.el @@ -1,12 +1,10 @@ ;;; ob-restclient-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "ob-restclient" "ob-restclient.el" (0 0 0 0)) +;;;### (autoloads nil "ob-restclient" "ob-restclient.el" (23994 46442 +;;;;;; 331202 311000)) ;;; Generated autoloads from ob-restclient.el (autoload 'org-babel-execute:restclient "ob-restclient" "\ @@ -15,14 +13,11 @@ This function is called by `org-babel-execute-src-block' \(fn BODY PARAMS)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-restclient" '("org-babel-"))) - ;;;*** ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; ob-restclient-autoloads.el ends here diff --git a/elpa/ob-restclient-20190626.1824/ob-restclient-pkg.el b/elpa/ob-restclient-20190626.1824/ob-restclient-pkg.el new file mode 100644 index 00000000..cf563df9 --- /dev/null +++ b/elpa/ob-restclient-20190626.1824/ob-restclient-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "ob-restclient" "20190626.1824" "org-babel functions for restclient-mode" '((restclient "0")) :commit "53376667eeddb1388fd6c6976f3222e7c8adcd46" :keywords '("literate programming" "reproducible research") :authors '(("Alf Lervåg")) :maintainer '("Alf Lervåg") :url "https://github.com/alf/ob-restclient.el") diff --git a/elpa/ob-restclient-20180904.709/ob-restclient.el b/elpa/ob-restclient-20190626.1824/ob-restclient.el similarity index 78% rename from elpa/ob-restclient-20180904.709/ob-restclient.el rename to elpa/ob-restclient-20190626.1824/ob-restclient.el index 7894cdef..6da01eb9 100644 --- a/elpa/ob-restclient-20180904.709/ob-restclient.el +++ b/elpa/ob-restclient-20190626.1824/ob-restclient.el @@ -4,8 +4,8 @@ ;; Author: Alf Lervåg ;; Keywords: literate programming, reproducible research -;; Package-Version: 20180904.709 -;; Homepage: http://orgmode.org +;; Package-Version: 20190626.1824 +;; Homepage: https://github.com/alf/ob-restclient.el ;; Version: 0.02 ;; Package-Requires: ((restclient "0")) @@ -78,7 +78,9 @@ This function is called by `org-babel-execute-src-block'" (when (search-forward (buffer-name) nil t) (error "Restclient encountered an error")) - (org-babel-restclient-wrap-result)))) + (if (org-babel-restclient-return-pure-payload-result-p params) + (org-babel-restclient-pure-payload-result) + (org-babel-restclient-wrap-result))))) (defun org-babel-restclient-wrap-result () "Wrap the contents of the buffer in an `org-mode' src block." @@ -88,5 +90,20 @@ This function is called by `org-babel-execute-src-block'" (insert "#+END_SRC\n") (buffer-string))) +(defun org-babel-restclient-pure-payload-result () + "Just return the payload." + (let ((comments-start + (save-excursion + (while (not (looking-at "//")) + (forward-line)) + (point)))) + (buffer-substring (point-min) comments-start))) + +(defun org-babel-restclient-return-pure-payload-result-p (params) + "Return `t' if the `:results' key in PARAMS contains `value' or `table'." + (let ((result-type (cdr (assoc :results params)))) + (when result-type + (string-match "value\\|table" result-type)))) + (provide 'ob-restclient) ;;; ob-restclient.el ends here diff --git a/elpa/ob-tmux-20180831.1017/ob-tmux-autoloads.el b/elpa/ob-tmux-20180831.1017/ob-tmux-autoloads.el deleted file mode 100644 index 54d66b83..00000000 --- a/elpa/ob-tmux-20180831.1017/ob-tmux-autoloads.el +++ /dev/null @@ -1,22 +0,0 @@ -;;; ob-tmux-autoloads.el --- automatically extracted autoloads -;; -;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - - -;;;### (autoloads nil "ob-tmux" "ob-tmux.el" (0 0 0 0)) -;;; Generated autoloads from ob-tmux.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-tmux" '("org-babel-" "ob-tmux--"))) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; coding: utf-8 -;; End: -;;; ob-tmux-autoloads.el ends here diff --git a/elpa/ob-tmux-20190708.1202/ob-tmux-autoloads.el b/elpa/ob-tmux-20190708.1202/ob-tmux-autoloads.el new file mode 100644 index 00000000..c9e622d1 --- /dev/null +++ b/elpa/ob-tmux-20190708.1202/ob-tmux-autoloads.el @@ -0,0 +1,15 @@ +;;; ob-tmux-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +;;;### (autoloads nil nil ("ob-tmux.el") (23994 46441 855796 628000)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; ob-tmux-autoloads.el ends here diff --git a/elpa/ob-tmux-20180831.1017/ob-tmux-pkg.el b/elpa/ob-tmux-20190708.1202/ob-tmux-pkg.el similarity index 66% rename from elpa/ob-tmux-20180831.1017/ob-tmux-pkg.el rename to elpa/ob-tmux-20190708.1202/ob-tmux-pkg.el index 4cd932d7..a62dff3b 100644 --- a/elpa/ob-tmux-20180831.1017/ob-tmux-pkg.el +++ b/elpa/ob-tmux-20190708.1202/ob-tmux-pkg.el @@ -1,2 +1,2 @@ ;;; -*- no-byte-compile: t -*- -(define-package "ob-tmux" "20180831.1017" "Babel Support for Interactive Terminal" '((emacs "25.1") (seq "2.3") (s "1.9.0")) :commit "73bed0ebad27f0ad57ea67582494543eb2fab73d" :keywords '("literate programming" "interactive shell" "tmux") :authors '(("Allard Hendriksen")) :maintainer '("Allard Hendriksen") :url "https://github.com/ahendriksen/ob-tmux") +(define-package "ob-tmux" "20190708.1202" "Babel Support for Interactive Terminal" '((emacs "25.1") (seq "2.3") (s "1.9.0")) :commit "3687ed7b874bdfe14617f5d14492887cb0836a85" :keywords '("literate programming" "interactive shell" "tmux") :authors '(("Allard Hendriksen")) :maintainer '("Allard Hendriksen") :url "https://github.com/ahendriksen/ob-tmux") diff --git a/elpa/ob-tmux-20180831.1017/ob-tmux.el b/elpa/ob-tmux-20190708.1202/ob-tmux.el similarity index 79% rename from elpa/ob-tmux-20180831.1017/ob-tmux.el rename to elpa/ob-tmux-20190708.1202/ob-tmux.el index 4410dabb..fbfb5b27 100644 --- a/elpa/ob-tmux-20180831.1017/ob-tmux.el +++ b/elpa/ob-tmux-20190708.1202/ob-tmux.el @@ -7,7 +7,7 @@ ;; Keywords: literate programming, interactive shell, tmux ;; URL: https://github.com/ahendriksen/ob-tmux ;; Version: 0.1.5 -;; Package-Version: 20180831.1017 +;; Package-Version: 20190708.1202 ;; Package-X-Original-version: 0.1.5 ;; Package-Requires: ((emacs "25.1") (seq "2.3") (s "1.9.0")) @@ -61,11 +61,20 @@ Change in case you want to use a different tmux than the one in your $PATH." :group 'org-babel :type 'string) +(defcustom org-babel-tmux-terminal "gnome-terminal" + "This is the terminal that will be spawned." + :group 'org-babel + :type 'string) + +(defcustom org-babel-tmux-terminal-opts '("--") + "The list of options that will be passed to the terminal." + :group 'org-babel + :type 'list) + (defvar org-babel-default-header-args:tmux '((:results . "silent") (:session . "default") - (:socket . nil) - (:terminal . "gnome-terminal")) + (:socket . nil)) "Default arguments to use when running tmux source blocks.") (add-to-list 'org-src-lang-modes '("tmux" . sh)) @@ -83,7 +92,8 @@ Argument PARAMS the org parameters of the code block." (message "Sending source code block to interactive terminal session...") (save-window-excursion (let* ((org-session (cdr (assq :session params))) - (terminal (cdr (assq :terminal params))) + (org-header-terminal (cdr (assq :terminal params))) + (terminal (or org-header-terminal org-babel-tmux-terminal)) (socket (cdr (assq :socket params))) (socket (when socket (expand-file-name socket))) (ob-session (ob-tmux--from-org-session org-session socket)) @@ -100,8 +110,12 @@ Argument PARAMS the org parameters of the code block." ;; Disable window renaming from within tmux (ob-tmux--disable-renaming ob-session) (ob-tmux--send-body - ob-session (org-babel-expand-body:generic body params))))) - + ob-session (org-babel-expand-body:generic body params)) + ;; Warn that setting the terminal from the org source block + ;; header arguments is going to be deprecated. + (message "ob-tmux terminal: %s" org-header-terminal) + (when org-header-terminal + (ob-tmux--deprecation-warning org-header-terminal))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ob-tmux object @@ -185,19 +199,17 @@ automatically space separated." (defun ob-tmux--start-terminal-window (ob-session terminal) "Start a TERMINAL window with tmux attached to session. -Argument OB-SESSION: the current ob-tmux session." - (let* ((process-name (concat "org-babel: terminal"))) + Argument OB-SESSION: the current ob-tmux session." + (let ((start-process-mandatory-args `("org-babel: terminal" + "*Messages*" + ,terminal)) + (tmux-cmd `(,org-babel-tmux-location + "attach-session" + "-t" ,(ob-tmux--target ob-session)))) (unless (ob-tmux--socket ob-session) - (if (string-equal terminal "xterm") - (start-process process-name "*Messages*" - terminal - "-T" (ob-tmux--target ob-session) - "-e" org-babel-tmux-location "attach-session" - "-t" (ob-tmux--target ob-session)) - (start-process process-name "*Messages*" - terminal "--" - org-babel-tmux-location "attach-session" - "-t" (ob-tmux--target ob-session)))))) + (apply 'start-process (append start-process-mandatory-args + org-babel-tmux-terminal-opts + tmux-cmd))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Tmux interaction @@ -247,33 +259,23 @@ Argument OB-SESSION: the current ob-tmux session." (ob-tmux--set-window-option ob-session "allow-rename" "off") (ob-tmux--set-window-option ob-session "automatic-rename" "off"))) + +(defun ob-tmux--format-keys (string) + "Format STRING as a sequence of hexadecimal numbers, to be sent via the `send-keys' command." + (mapcar (lambda (c) (format "0x%x" c)) + string)) + (defun ob-tmux--send-keys (ob-session line) "If tmux window exists, send a LINE of text to it. Argument OB-SESSION: the current ob-tmux session." (when (ob-tmux--window-alive-p ob-session) - (ob-tmux--execute ob-session - "send-keys" - "-l" - "-t" (ob-tmux--target ob-session) - ;; Replace semicolon at end of line with `\;'. - - ;; Tmux assumes a semicolon at the end of a command-line argument - ;; means that a new command is started. See tmux man page around - ;; "Multiple commands may ... a command sequence." This allows, - ;; for example, the following two commands to be executed in one - ;; line: - ;; - ;; tmux new-window; split-window -d - ;; - ;; To prevent tmux from interpreting a trailing semicolon as a - ;; command separator, we replace the semicolon with `\;'. - ;; - ;; Note: we are already using the `-l' (literal) flag. This does - ;; not prevent tmux from interpreting a trailing semicolon as a - ;; command separator. - (replace-regexp-in-string ";$" "\\\\;" line) - "\n"))) + (let* ((hex-line (ob-tmux--format-keys line))) + (apply 'ob-tmux--execute + ob-session + "send-keys" + "-t" (ob-tmux--target ob-session) + hex-line)))) (defun ob-tmux--send-body (ob-session body) "If tmux window (passed in OB-SESSION) exists, send BODY to it. @@ -281,7 +283,9 @@ Argument OB-SESSION: the current ob-tmux session." Argument OB-SESSION: the current ob-tmux session." (let ((lines (split-string body "[\n\r]+"))) (when (ob-tmux--window-alive-p ob-session) - (mapc (lambda (l) (ob-tmux--send-keys ob-session l)) lines)))) + (mapc (lambda (l) + (ob-tmux--send-keys ob-session (concat l "\n"))) + lines)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Tmux interrogation @@ -313,6 +317,42 @@ If no window is specified in OB-SESSION, returns 't." 't)))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Warnings +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun ob-tmux--deprecation-warning (org-header-terminal) + (let* ((message (format "DEPRECATION WARNING: Setting `:terminal` using org source block header arguments is deprecated. + +Consider changing your ob-tmux configuration as follows: + +(setq org-babel-default-header-args:tmux + '((:results . \"\") + (:session . \"\") + (:terminal. \"%s\") ; <--- REMOVE THIS LINE + (:socket . nil))) + +;; You can now customize the terminal and its options as follows: +(setq org-babel-tmux-terminal \"%s\") +(setq org-babel-tmux-terminal-opts '(\"-T\" \"ob-tmux\" \"-e\")) +; The default terminal is \"gnome-terminal\" with options \"--\". + +If you have any source blocks containing `:terminal`, please consider removing them: + + #+begin_src tmux :session test :terminal %s + echo hello + #+end_src + +Becomes: + + #+begin_src tmux :session test + echo hello + #+end_src + +End of warning. (See *Warnings* buffer for full message) +" org-header-terminal org-header-terminal org-header-terminal))) + (display-warning 'deprecation-warning message :warning) + message)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Test functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/elpa/org-20190930/COPYING b/elpa/org-20191028/COPYING similarity index 100% rename from elpa/org-20190930/COPYING rename to elpa/org-20191028/COPYING diff --git a/elpa/org-20190930/README_ELPA b/elpa/org-20191028/README_ELPA similarity index 100% rename from elpa/org-20190930/README_ELPA rename to elpa/org-20191028/README_ELPA diff --git a/elpa/org-20190930/dir b/elpa/org-20191028/dir similarity index 100% rename from elpa/org-20190930/dir rename to elpa/org-20191028/dir diff --git a/elpa/org-20190930/etc/ORG-NEWS b/elpa/org-20191028/etc/ORG-NEWS similarity index 100% rename from elpa/org-20190930/etc/ORG-NEWS rename to elpa/org-20191028/etc/ORG-NEWS diff --git a/elpa/org-20190930/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-20191028/etc/styles/OrgOdtContentTemplate.xml similarity index 100% rename from elpa/org-20190930/etc/styles/OrgOdtContentTemplate.xml rename to elpa/org-20191028/etc/styles/OrgOdtContentTemplate.xml diff --git a/elpa/org-20190930/etc/styles/OrgOdtStyles.xml b/elpa/org-20191028/etc/styles/OrgOdtStyles.xml similarity index 100% rename from elpa/org-20190930/etc/styles/OrgOdtStyles.xml rename to elpa/org-20191028/etc/styles/OrgOdtStyles.xml diff --git a/elpa/org-20190930/etc/styles/README b/elpa/org-20191028/etc/styles/README similarity index 100% rename from elpa/org-20190930/etc/styles/README rename to elpa/org-20191028/etc/styles/README diff --git a/elpa/org-20190930/ob-C.el b/elpa/org-20191028/ob-C.el similarity index 100% rename from elpa/org-20190930/ob-C.el rename to elpa/org-20191028/ob-C.el diff --git a/elpa/org-20190930/ob-J.el b/elpa/org-20191028/ob-J.el similarity index 100% rename from elpa/org-20190930/ob-J.el rename to elpa/org-20191028/ob-J.el diff --git a/elpa/org-20190930/ob-R.el b/elpa/org-20191028/ob-R.el similarity index 100% rename from elpa/org-20190930/ob-R.el rename to elpa/org-20191028/ob-R.el diff --git a/elpa/org-20190930/ob-abc.el b/elpa/org-20191028/ob-abc.el similarity index 100% rename from elpa/org-20190930/ob-abc.el rename to elpa/org-20191028/ob-abc.el diff --git a/elpa/org-20190930/ob-asymptote.el b/elpa/org-20191028/ob-asymptote.el similarity index 100% rename from elpa/org-20190930/ob-asymptote.el rename to elpa/org-20191028/ob-asymptote.el diff --git a/elpa/org-20190930/ob-awk.el b/elpa/org-20191028/ob-awk.el similarity index 100% rename from elpa/org-20190930/ob-awk.el rename to elpa/org-20191028/ob-awk.el diff --git a/elpa/org-20190930/ob-calc.el b/elpa/org-20191028/ob-calc.el similarity index 100% rename from elpa/org-20190930/ob-calc.el rename to elpa/org-20191028/ob-calc.el diff --git a/elpa/org-20190930/ob-clojure.el b/elpa/org-20191028/ob-clojure.el similarity index 100% rename from elpa/org-20190930/ob-clojure.el rename to elpa/org-20191028/ob-clojure.el diff --git a/elpa/org-20190930/ob-comint.el b/elpa/org-20191028/ob-comint.el similarity index 100% rename from elpa/org-20190930/ob-comint.el rename to elpa/org-20191028/ob-comint.el diff --git a/elpa/org-20190930/ob-coq.el b/elpa/org-20191028/ob-coq.el similarity index 100% rename from elpa/org-20190930/ob-coq.el rename to elpa/org-20191028/ob-coq.el diff --git a/elpa/org-20190930/ob-core.el b/elpa/org-20191028/ob-core.el similarity index 99% rename from elpa/org-20190930/ob-core.el rename to elpa/org-20191028/ob-core.el index 6f4101f6..9a9409ea 100644 --- a/elpa/org-20190930/ob-core.el +++ b/elpa/org-20191028/ob-core.el @@ -526,7 +526,7 @@ to raise errors for all languages.") "Hook for functions to be called after `org-babel-execute-src-block'") (defun org-babel-named-src-block-regexp-for-name (&optional name) - "This generates a regexp used to match a source block named NAME. + "Generate a regexp used to match a source block named NAME. If NAME is nil, match any name. Matched name is then put in match group 9. Other match groups are defined in `org-babel-src-block-regexp'." @@ -537,7 +537,7 @@ match group 9. Other match groups are defined in (substring org-babel-src-block-regexp 1))) (defun org-babel-named-data-regexp-for-name (name) - "This generates a regexp used to match data named NAME." + "Generate a regexp used to match data named NAME." (concat org-babel-name-regexp (regexp-quote name) "[ \t]*$")) (defun org-babel--normalize-body (datum) @@ -1789,7 +1789,7 @@ to `org-babel-named-src-block-regexp'." (ignore-errors (org-next-block 1 nil regexp)))))) (defun org-babel-src-block-names (&optional file) - "Returns the names of source blocks in FILE or the current buffer." + "Return the names of source blocks in FILE or the current buffer." (with-current-buffer (if file (find-file-noselect file) (current-buffer)) (org-with-point-at 1 (let ((regexp "^[ \t]*#\\+begin_src ") @@ -1834,7 +1834,7 @@ buffer or nil if no such result exists." (throw :found (line-beginning-position))))))))) (defun org-babel-result-names (&optional file) - "Returns the names of results in FILE or the current buffer." + "Return the names of results in FILE or the current buffer." (save-excursion (when file (find-file file)) (goto-char (point-min)) (let ((case-fold-search t) names) diff --git a/elpa/org-20190930/ob-css.el b/elpa/org-20191028/ob-css.el similarity index 100% rename from elpa/org-20190930/ob-css.el rename to elpa/org-20191028/ob-css.el diff --git a/elpa/org-20190930/ob-ditaa.el b/elpa/org-20191028/ob-ditaa.el similarity index 100% rename from elpa/org-20190930/ob-ditaa.el rename to elpa/org-20191028/ob-ditaa.el diff --git a/elpa/org-20190930/ob-dot.el b/elpa/org-20191028/ob-dot.el similarity index 100% rename from elpa/org-20190930/ob-dot.el rename to elpa/org-20191028/ob-dot.el diff --git a/elpa/org-20190930/ob-ebnf.el b/elpa/org-20191028/ob-ebnf.el similarity index 100% rename from elpa/org-20190930/ob-ebnf.el rename to elpa/org-20191028/ob-ebnf.el diff --git a/elpa/org-20190930/ob-emacs-lisp.el b/elpa/org-20191028/ob-emacs-lisp.el similarity index 100% rename from elpa/org-20190930/ob-emacs-lisp.el rename to elpa/org-20191028/ob-emacs-lisp.el diff --git a/elpa/org-20190930/ob-eval.el b/elpa/org-20191028/ob-eval.el similarity index 100% rename from elpa/org-20190930/ob-eval.el rename to elpa/org-20191028/ob-eval.el diff --git a/elpa/org-20190930/ob-exp.el b/elpa/org-20191028/ob-exp.el similarity index 100% rename from elpa/org-20190930/ob-exp.el rename to elpa/org-20191028/ob-exp.el diff --git a/elpa/org-20190930/ob-forth.el b/elpa/org-20191028/ob-forth.el similarity index 100% rename from elpa/org-20190930/ob-forth.el rename to elpa/org-20191028/ob-forth.el diff --git a/elpa/org-20190930/ob-fortran.el b/elpa/org-20191028/ob-fortran.el similarity index 100% rename from elpa/org-20190930/ob-fortran.el rename to elpa/org-20191028/ob-fortran.el diff --git a/elpa/org-20190930/ob-gnuplot.el b/elpa/org-20191028/ob-gnuplot.el similarity index 100% rename from elpa/org-20190930/ob-gnuplot.el rename to elpa/org-20191028/ob-gnuplot.el diff --git a/elpa/org-20190930/ob-groovy.el b/elpa/org-20191028/ob-groovy.el similarity index 100% rename from elpa/org-20190930/ob-groovy.el rename to elpa/org-20191028/ob-groovy.el diff --git a/elpa/org-20190930/ob-haskell.el b/elpa/org-20191028/ob-haskell.el similarity index 100% rename from elpa/org-20190930/ob-haskell.el rename to elpa/org-20191028/ob-haskell.el diff --git a/elpa/org-20190930/ob-hledger.el b/elpa/org-20191028/ob-hledger.el similarity index 100% rename from elpa/org-20190930/ob-hledger.el rename to elpa/org-20191028/ob-hledger.el diff --git a/elpa/org-20190930/ob-io.el b/elpa/org-20191028/ob-io.el similarity index 100% rename from elpa/org-20190930/ob-io.el rename to elpa/org-20191028/ob-io.el diff --git a/elpa/org-20190930/ob-java.el b/elpa/org-20191028/ob-java.el similarity index 100% rename from elpa/org-20190930/ob-java.el rename to elpa/org-20191028/ob-java.el diff --git a/elpa/org-20190930/ob-js.el b/elpa/org-20191028/ob-js.el similarity index 100% rename from elpa/org-20190930/ob-js.el rename to elpa/org-20191028/ob-js.el diff --git a/elpa/org-20190930/ob-keys.el b/elpa/org-20191028/ob-keys.el similarity index 100% rename from elpa/org-20190930/ob-keys.el rename to elpa/org-20191028/ob-keys.el diff --git a/elpa/org-20190930/ob-latex.el b/elpa/org-20191028/ob-latex.el similarity index 100% rename from elpa/org-20190930/ob-latex.el rename to elpa/org-20191028/ob-latex.el diff --git a/elpa/org-20190930/ob-ledger.el b/elpa/org-20191028/ob-ledger.el similarity index 100% rename from elpa/org-20190930/ob-ledger.el rename to elpa/org-20191028/ob-ledger.el diff --git a/elpa/org-20190930/ob-lilypond.el b/elpa/org-20191028/ob-lilypond.el similarity index 100% rename from elpa/org-20190930/ob-lilypond.el rename to elpa/org-20191028/ob-lilypond.el diff --git a/elpa/org-20190930/ob-lisp.el b/elpa/org-20191028/ob-lisp.el similarity index 100% rename from elpa/org-20190930/ob-lisp.el rename to elpa/org-20191028/ob-lisp.el diff --git a/elpa/org-20190930/ob-lob.el b/elpa/org-20191028/ob-lob.el similarity index 100% rename from elpa/org-20190930/ob-lob.el rename to elpa/org-20191028/ob-lob.el diff --git a/elpa/org-20190930/ob-lua.el b/elpa/org-20191028/ob-lua.el similarity index 100% rename from elpa/org-20190930/ob-lua.el rename to elpa/org-20191028/ob-lua.el diff --git a/elpa/org-20190930/ob-makefile.el b/elpa/org-20191028/ob-makefile.el similarity index 100% rename from elpa/org-20190930/ob-makefile.el rename to elpa/org-20191028/ob-makefile.el diff --git a/elpa/org-20190930/ob-matlab.el b/elpa/org-20191028/ob-matlab.el similarity index 100% rename from elpa/org-20190930/ob-matlab.el rename to elpa/org-20191028/ob-matlab.el diff --git a/elpa/org-20190930/ob-maxima.el b/elpa/org-20191028/ob-maxima.el similarity index 100% rename from elpa/org-20190930/ob-maxima.el rename to elpa/org-20191028/ob-maxima.el diff --git a/elpa/org-20190930/ob-mscgen.el b/elpa/org-20191028/ob-mscgen.el similarity index 100% rename from elpa/org-20190930/ob-mscgen.el rename to elpa/org-20191028/ob-mscgen.el diff --git a/elpa/org-20190930/ob-ocaml.el b/elpa/org-20191028/ob-ocaml.el similarity index 100% rename from elpa/org-20190930/ob-ocaml.el rename to elpa/org-20191028/ob-ocaml.el diff --git a/elpa/org-20190930/ob-octave.el b/elpa/org-20191028/ob-octave.el similarity index 100% rename from elpa/org-20190930/ob-octave.el rename to elpa/org-20191028/ob-octave.el diff --git a/elpa/org-20190930/ob-org.el b/elpa/org-20191028/ob-org.el similarity index 100% rename from elpa/org-20190930/ob-org.el rename to elpa/org-20191028/ob-org.el diff --git a/elpa/org-20190930/ob-perl.el b/elpa/org-20191028/ob-perl.el similarity index 100% rename from elpa/org-20190930/ob-perl.el rename to elpa/org-20191028/ob-perl.el diff --git a/elpa/org-20190930/ob-picolisp.el b/elpa/org-20191028/ob-picolisp.el similarity index 100% rename from elpa/org-20190930/ob-picolisp.el rename to elpa/org-20191028/ob-picolisp.el diff --git a/elpa/org-20190930/ob-plantuml.el b/elpa/org-20191028/ob-plantuml.el similarity index 100% rename from elpa/org-20190930/ob-plantuml.el rename to elpa/org-20191028/ob-plantuml.el diff --git a/elpa/org-20190930/ob-processing.el b/elpa/org-20191028/ob-processing.el similarity index 100% rename from elpa/org-20190930/ob-processing.el rename to elpa/org-20191028/ob-processing.el diff --git a/elpa/org-20190930/ob-python.el b/elpa/org-20191028/ob-python.el similarity index 100% rename from elpa/org-20190930/ob-python.el rename to elpa/org-20191028/ob-python.el diff --git a/elpa/org-20190930/ob-ref.el b/elpa/org-20191028/ob-ref.el similarity index 100% rename from elpa/org-20190930/ob-ref.el rename to elpa/org-20191028/ob-ref.el diff --git a/elpa/org-20190930/ob-ruby.el b/elpa/org-20191028/ob-ruby.el similarity index 100% rename from elpa/org-20190930/ob-ruby.el rename to elpa/org-20191028/ob-ruby.el diff --git a/elpa/org-20190930/ob-sass.el b/elpa/org-20191028/ob-sass.el similarity index 100% rename from elpa/org-20190930/ob-sass.el rename to elpa/org-20191028/ob-sass.el diff --git a/elpa/org-20190930/ob-scheme.el b/elpa/org-20191028/ob-scheme.el similarity index 99% rename from elpa/org-20190930/ob-scheme.el rename to elpa/org-20191028/ob-scheme.el index 251ed52b..21d9fad2 100644 --- a/elpa/org-20190930/ob-scheme.el +++ b/elpa/org-20191028/ob-scheme.el @@ -102,7 +102,7 @@ (puthash session-name buffer org-babel-scheme-repl-map)) (defun org-babel-scheme-get-buffer-impl (buffer) - "Returns the scheme implementation geiser associates with the buffer." + "Return the scheme implementation geiser associates with the buffer." (with-current-buffer (set-buffer buffer) geiser-impl--implementation)) diff --git a/elpa/org-20190930/ob-screen.el b/elpa/org-20191028/ob-screen.el similarity index 100% rename from elpa/org-20190930/ob-screen.el rename to elpa/org-20191028/ob-screen.el diff --git a/elpa/org-20190930/ob-sed.el b/elpa/org-20191028/ob-sed.el similarity index 100% rename from elpa/org-20190930/ob-sed.el rename to elpa/org-20191028/ob-sed.el diff --git a/elpa/org-plus-contrib-20190930/ob-shell.el b/elpa/org-20191028/ob-shell.el similarity index 97% rename from elpa/org-plus-contrib-20190930/ob-shell.el rename to elpa/org-20191028/ob-shell.el index 66c28f7f..88342bab 100644 --- a/elpa/org-plus-contrib-20190930/ob-shell.el +++ b/elpa/org-20191028/ob-shell.el @@ -112,12 +112,12 @@ This function is called by `org-babel-execute-src-block'." ;;; Helper functions (defun org-babel--variable-assignments:sh-generic (varname values &optional sep hline) - "Returns a list of statements declaring the values as a generic variable." + "Return a list of statements declaring the values as a generic variable." (format "%s=%s" varname (org-babel-sh-var-to-sh values sep hline))) (defun org-babel--variable-assignments:bash_array (varname values &optional sep hline) - "Returns a list of statements declaring the values as a bash array." + "Return a list of statements declaring the values as a bash array." (format "unset %s\ndeclare -a %s=( %s )" varname varname (mapconcat @@ -127,7 +127,7 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel--variable-assignments:bash_assoc (varname values &optional sep hline) - "Returns a list of statements declaring the values as bash associative array." + "Return a list of statements declaring the values as bash associative array." (format "unset %s\ndeclare -A %s\n%s" varname varname (mapconcat @@ -140,7 +140,7 @@ This function is called by `org-babel-execute-src-block'." "\n"))) (defun org-babel--variable-assignments:bash (varname values &optional sep hline) - "Represents the parameters as useful Bash shell variables." + "Represent the parameters as useful Bash shell variables." (pcase values (`((,_ ,_ . ,_) . ,_) ;two-dimensional array (org-babel--variable-assignments:bash_assoc varname values sep hline)) diff --git a/elpa/org-20190930/ob-shen.el b/elpa/org-20191028/ob-shen.el similarity index 100% rename from elpa/org-20190930/ob-shen.el rename to elpa/org-20191028/ob-shen.el diff --git a/elpa/org-20190930/ob-sql.el b/elpa/org-20191028/ob-sql.el similarity index 100% rename from elpa/org-20190930/ob-sql.el rename to elpa/org-20191028/ob-sql.el diff --git a/elpa/org-20190930/ob-sqlite.el b/elpa/org-20191028/ob-sqlite.el similarity index 100% rename from elpa/org-20190930/ob-sqlite.el rename to elpa/org-20191028/ob-sqlite.el diff --git a/elpa/org-20190930/ob-stan.el b/elpa/org-20191028/ob-stan.el similarity index 100% rename from elpa/org-20190930/ob-stan.el rename to elpa/org-20191028/ob-stan.el diff --git a/elpa/org-20190930/ob-table.el b/elpa/org-20191028/ob-table.el similarity index 100% rename from elpa/org-20190930/ob-table.el rename to elpa/org-20191028/ob-table.el diff --git a/elpa/org-20190930/ob-tangle.el b/elpa/org-20191028/ob-tangle.el similarity index 100% rename from elpa/org-20190930/ob-tangle.el rename to elpa/org-20191028/ob-tangle.el diff --git a/elpa/org-20190930/ob-vala.el b/elpa/org-20191028/ob-vala.el similarity index 100% rename from elpa/org-20190930/ob-vala.el rename to elpa/org-20191028/ob-vala.el diff --git a/elpa/org-20190930/ob.el b/elpa/org-20191028/ob.el similarity index 100% rename from elpa/org-20190930/ob.el rename to elpa/org-20191028/ob.el diff --git a/elpa/org-20190930/org b/elpa/org-20191028/org similarity index 100% rename from elpa/org-20190930/org rename to elpa/org-20191028/org diff --git a/elpa/org-20190930/org-agenda.el b/elpa/org-20191028/org-agenda.el similarity index 100% rename from elpa/org-20190930/org-agenda.el rename to elpa/org-20191028/org-agenda.el diff --git a/elpa/org-20190930/org-archive.el b/elpa/org-20191028/org-archive.el similarity index 100% rename from elpa/org-20190930/org-archive.el rename to elpa/org-20191028/org-archive.el diff --git a/elpa/org-20190930/org-attach.el b/elpa/org-20191028/org-attach.el similarity index 100% rename from elpa/org-20190930/org-attach.el rename to elpa/org-20191028/org-attach.el diff --git a/elpa/org-20190930/org-autoloads.el b/elpa/org-20191028/org-autoloads.el similarity index 54% rename from elpa/org-20190930/org-autoloads.el rename to elpa/org-20191028/org-autoloads.el index 6496da61..a49a7fef 100644 --- a/elpa/org-20190930/org-autoloads.el +++ b/elpa/org-20191028/org-autoloads.el @@ -1,397 +1,9 @@ ;;; org-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - - -;;;### (autoloads nil "ob-C" "ob-C.el" (0 0 0 0)) -;;; Generated autoloads from ob-C.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-C" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-J" "ob-J.el" (0 0 0 0)) -;;; Generated autoloads from ob-J.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-J" '("obj-" "org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-R" "ob-R.el" (0 0 0 0)) -;;; Generated autoloads from ob-R.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-R" '("ob-R-" "org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-abc" "ob-abc.el" (0 0 0 0)) -;;; Generated autoloads from ob-abc.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-abc" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-asymptote" "ob-asymptote.el" (0 0 0 0)) -;;; Generated autoloads from ob-asymptote.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-asymptote" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-awk" "ob-awk.el" (0 0 0 0)) -;;; Generated autoloads from ob-awk.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-awk" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-calc" "ob-calc.el" (0 0 0 0)) -;;; Generated autoloads from ob-calc.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-calc" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-clojure" "ob-clojure.el" (0 0 0 0)) -;;; Generated autoloads from ob-clojure.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-clojure" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-comint" "ob-comint.el" (0 0 0 0)) -;;; Generated autoloads from ob-comint.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-comint" '("org-babel-comint-"))) - -;;;*** - -;;;### (autoloads nil "ob-coq" "ob-coq.el" (0 0 0 0)) -;;; Generated autoloads from ob-coq.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-coq" '("org-babel-" "coq-program-name"))) - -;;;*** - -;;;### (autoloads nil "ob-css" "ob-css.el" (0 0 0 0)) -;;; Generated autoloads from ob-css.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-css" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-ditaa" "ob-ditaa.el" (0 0 0 0)) -;;; Generated autoloads from ob-ditaa.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ditaa" '("org-"))) - -;;;*** - -;;;### (autoloads nil "ob-dot" "ob-dot.el" (0 0 0 0)) -;;; Generated autoloads from ob-dot.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-dot" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-ebnf" "ob-ebnf.el" (0 0 0 0)) -;;; Generated autoloads from ob-ebnf.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ebnf" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-emacs-lisp" "ob-emacs-lisp.el" (0 0 0 0)) -;;; Generated autoloads from ob-emacs-lisp.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-emacs-lisp" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-eval" "ob-eval.el" (0 0 0 0)) -;;; Generated autoloads from ob-eval.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-eval" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-exp" "ob-exp.el" (0 0 0 0)) -;;; Generated autoloads from ob-exp.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-exp" '("org-"))) - -;;;*** - -;;;### (autoloads nil "ob-forth" "ob-forth.el" (0 0 0 0)) -;;; Generated autoloads from ob-forth.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-forth" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-fortran" "ob-fortran.el" (0 0 0 0)) -;;; Generated autoloads from ob-fortran.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-fortran" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-gnuplot" "ob-gnuplot.el" (0 0 0 0)) -;;; Generated autoloads from ob-gnuplot.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-gnuplot" '("org-babel-" "*org-babel-gnuplot-"))) - -;;;*** - -;;;### (autoloads nil "ob-groovy" "ob-groovy.el" (0 0 0 0)) -;;; Generated autoloads from ob-groovy.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-groovy" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-haskell" "ob-haskell.el" (0 0 0 0)) -;;; Generated autoloads from ob-haskell.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-haskell" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-hledger" "ob-hledger.el" (0 0 0 0)) -;;; Generated autoloads from ob-hledger.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-hledger" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-io" "ob-io.el" (0 0 0 0)) -;;; Generated autoloads from ob-io.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-io" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-java" "ob-java.el" (0 0 0 0)) -;;; Generated autoloads from ob-java.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-java" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-js" "ob-js.el" (0 0 0 0)) -;;; Generated autoloads from ob-js.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-js" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-latex" "ob-latex.el" (0 0 0 0)) -;;; Generated autoloads from ob-latex.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-latex" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-ledger" "ob-ledger.el" (0 0 0 0)) -;;; Generated autoloads from ob-ledger.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ledger" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-lilypond" "ob-lilypond.el" (0 0 0 0)) -;;; Generated autoloads from ob-lilypond.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lilypond" '("org-babel-" "lilypond-mode"))) - -;;;*** - -;;;### (autoloads nil "ob-lisp" "ob-lisp.el" (0 0 0 0)) -;;; Generated autoloads from ob-lisp.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lisp" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-lua" "ob-lua.el" (0 0 0 0)) -;;; Generated autoloads from ob-lua.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lua" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-makefile" "ob-makefile.el" (0 0 0 0)) -;;; Generated autoloads from ob-makefile.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-makefile" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-maxima" "ob-maxima.el" (0 0 0 0)) -;;; Generated autoloads from ob-maxima.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-maxima" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-mscgen" "ob-mscgen.el" (0 0 0 0)) -;;; Generated autoloads from ob-mscgen.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-mscgen" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-ocaml" "ob-ocaml.el" (0 0 0 0)) -;;; Generated autoloads from ob-ocaml.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ocaml" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-octave" "ob-octave.el" (0 0 0 0)) -;;; Generated autoloads from ob-octave.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-octave" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-org" "ob-org.el" (0 0 0 0)) -;;; Generated autoloads from ob-org.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-org" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-perl" "ob-perl.el" (0 0 0 0)) -;;; Generated autoloads from ob-perl.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-perl" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-picolisp" "ob-picolisp.el" (0 0 0 0)) -;;; Generated autoloads from ob-picolisp.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-picolisp" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-plantuml" "ob-plantuml.el" (0 0 0 0)) -;;; Generated autoloads from ob-plantuml.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-plantuml" '("org-"))) - -;;;*** - -;;;### (autoloads nil "ob-processing" "ob-processing.el" (0 0 0 0)) -;;; Generated autoloads from ob-processing.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-processing" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-python" "ob-python.el" (0 0 0 0)) -;;; Generated autoloads from ob-python.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-python" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-ref" "ob-ref.el" (0 0 0 0)) -;;; Generated autoloads from ob-ref.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ref" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-ruby" "ob-ruby.el" (0 0 0 0)) -;;; Generated autoloads from ob-ruby.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ruby" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-sass" "ob-sass.el" (0 0 0 0)) -;;; Generated autoloads from ob-sass.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sass" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-scheme" "ob-scheme.el" (0 0 0 0)) -;;; Generated autoloads from ob-scheme.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-scheme" '("org-babel-"))) - -;;;*** +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "ob-screen" "ob-screen.el" (0 0 0 0)) -;;; Generated autoloads from ob-screen.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-screen" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-sed" "ob-sed.el" (0 0 0 0)) -;;; Generated autoloads from ob-sed.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sed" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-shell" "ob-shell.el" (0 0 0 0)) -;;; Generated autoloads from ob-shell.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-shell" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-shen" "ob-shen.el" (0 0 0 0)) -;;; Generated autoloads from ob-shen.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-shen" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-sql" "ob-sql.el" (0 0 0 0)) -;;; Generated autoloads from ob-sql.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sql" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-sqlite" "ob-sqlite.el" (0 0 0 0)) -;;; Generated autoloads from ob-sqlite.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sqlite" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-stan" "ob-stan.el" (0 0 0 0)) -;;; Generated autoloads from ob-stan.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-stan" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "ob-table" "ob-table.el" (0 0 0 0)) -;;; Generated autoloads from ob-table.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-table" '("org-"))) - -;;;*** - -;;;### (autoloads nil "ob-vala" "ob-vala.el" (0 0 0 0)) -;;; Generated autoloads from ob-vala.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-vala" '("org-babel-"))) - -;;;*** - -;;;### (autoloads nil "org" "org.el" (0 0 0 0)) +;;;### (autoloads nil "org" "org.el" (23994 42575 349796 102000)) ;;; Generated autoloads from org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -595,11 +207,10 @@ Call the customize function with org as argument. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org" '("org-" "turn-on-org-cdlatex"))) - ;;;*** -;;;### (autoloads nil "org-agenda" "org-agenda.el" (0 0 0 0)) +;;;### (autoloads nil "org-agenda" "org-agenda.el" (23994 42575 282485 +;;;;;; 977000)) ;;; Generated autoloads from org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -873,18 +484,10 @@ to override `appt-message-warning-time'. \(fn &optional REFRESH FILTER &rest ARGS)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-agenda" '("org-"))) - -;;;*** - -;;;### (autoloads nil "org-bibtex" "org-bibtex.el" (0 0 0 0)) -;;; Generated autoloads from org-bibtex.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-bibtex" '("org-"))) - ;;;*** -;;;### (autoloads nil "org-capture" "org-capture.el" (0 0 0 0)) +;;;### (autoloads nil "org-capture" "org-capture.el" (23994 42575 +;;;;;; 289881 936000)) ;;; Generated autoloads from org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -928,11 +531,10 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-capture" '("org-capture-"))) - ;;;*** -;;;### (autoloads nil "org-colview" "org-colview.el" (0 0 0 0)) +;;;### (autoloads nil "org-colview" "org-colview.el" (23994 42575 +;;;;;; 292988 339000)) ;;; Generated autoloads from org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -1028,11 +630,10 @@ Turn on or update column view in the agenda. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-colview" '("org-"))) - ;;;*** -;;;### (autoloads nil "org-compat" "org-compat.el" (0 0 0 0)) +;;;### (autoloads nil "org-compat" "org-compat.el" (23994 42575 294341 +;;;;;; 936000)) ;;; Generated autoloads from org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -1040,32 +641,10 @@ Try very hard to provide sensible version strings. \(fn)" nil t) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-compat" '("org-"))) - -;;;*** - -;;;### (autoloads nil "org-crypt" "org-crypt.el" (0 0 0 0)) -;;; Generated autoloads from org-crypt.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-crypt" '("org-"))) - -;;;*** - -;;;### (autoloads nil "org-ctags" "org-ctags.el" (0 0 0 0)) -;;; Generated autoloads from org-ctags.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-ctags" '("org-ctags-"))) - -;;;*** - -;;;### (autoloads nil "org-docview" "org-docview.el" (0 0 0 0)) -;;; Generated autoloads from org-docview.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-docview" '("org-docview-"))) - ;;;*** -;;;### (autoloads nil "org-duration" "org-duration.el" (0 0 0 0)) +;;;### (autoloads nil "org-duration" "org-duration.el" (23994 42575 +;;;;;; 300963 551000)) ;;; Generated autoloads from org-duration.el (autoload 'org-duration-set-regexps "org-duration" "\ @@ -1117,46 +696,10 @@ with \"H:MM:SS\" format, return `h:mm:ss'. Otherwise, return \(fn TIMES)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-duration" '("org-duration-"))) - -;;;*** - -;;;### (autoloads nil "org-entities" "org-entities.el" (0 0 0 0)) -;;; Generated autoloads from org-entities.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-entities" '("org-entit"))) - -;;;*** - -;;;### (autoloads nil "org-eshell" "org-eshell.el" (0 0 0 0)) -;;; Generated autoloads from org-eshell.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-eshell" '("org-eshell-"))) - -;;;*** - -;;;### (autoloads nil "org-eww" "org-eww.el" (0 0 0 0)) -;;; Generated autoloads from org-eww.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-eww" '("org-eww-"))) - -;;;*** - -;;;### (autoloads nil "org-faces" "org-faces.el" (0 0 0 0)) -;;; Generated autoloads from org-faces.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-faces" '("org-"))) - -;;;*** - -;;;### (autoloads nil "org-gnus" "org-gnus.el" (0 0 0 0)) -;;; Generated autoloads from org-gnus.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-gnus" '("org-gnus-"))) - ;;;*** -;;;### (autoloads nil "org-goto" "org-goto.el" (0 0 0 0)) +;;;### (autoloads nil "org-goto" "org-goto.el" (23994 42575 313089 +;;;;;; 494000)) ;;; Generated autoloads from org-goto.el (autoload 'org-goto-location "org-goto" "\ @@ -1188,33 +731,10 @@ With a prefix argument, use the alternative interface: e.g., if \(fn &optional ALTERNATIVE-INTERFACE)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-goto" '("org-goto-"))) - -;;;*** - -;;;### (autoloads nil "org-habit" "org-habit.el" (0 0 0 0)) -;;; Generated autoloads from org-habit.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-habit" '("org-"))) - -;;;*** - -;;;### (autoloads nil "org-info" "org-info.el" (0 0 0 0)) -;;; Generated autoloads from org-info.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-info" '("org-info-"))) - -;;;*** - -;;;### (autoloads nil "org-inlinetask" "org-inlinetask.el" (0 0 0 -;;;;;; 0)) -;;; Generated autoloads from org-inlinetask.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-inlinetask" '("org-inlinetask-"))) - ;;;*** -;;;### (autoloads nil "org-lint" "org-lint.el" (0 0 0 0)) +;;;### (autoloads nil "org-lint" "org-lint.el" (23994 42575 323648 +;;;;;; 811000)) ;;; Generated autoloads from org-lint.el (autoload 'org-lint "org-lint" "\ @@ -1228,25 +748,10 @@ ARG can also be a list of checker names, as symbols, to run. \(fn &optional ARG)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-lint" '("org-lint-"))) - -;;;*** - -;;;### (autoloads nil "org-list" "org-list.el" (0 0 0 0)) -;;; Generated autoloads from org-list.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-list" '("org-"))) - ;;;*** -;;;### (autoloads nil "org-macro" "org-macro.el" (0 0 0 0)) -;;; Generated autoloads from org-macro.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-macro" '("org-macro-"))) - -;;;*** - -;;;### (autoloads nil "org-macs" "org-macs.el" (0 0 0 0)) +;;;### (autoloads nil "org-macs" "org-macs.el" (23994 42575 329756 +;;;;;; 315000)) ;;; Generated autoloads from org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -1254,92 +759,10 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. \(fn FILE)" nil t) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-macs" '("org-"))) - ;;;*** -;;;### (autoloads nil "org-mhe" "org-mhe.el" (0 0 0 0)) -;;; Generated autoloads from org-mhe.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mhe" '("org-mhe-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "org-mobile" "org-mobile.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-mobile.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mobile" '("org-mobile-"))) - -;;;*** - -;;;### (autoloads nil "org-mouse" "org-mouse.el" (0 0 0 0)) -;;; Generated autoloads from org-mouse.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mouse" '("org-mouse-"))) - -;;;*** - -;;;### (autoloads nil "org-pcomplete" "org-pcomplete.el" (0 0 0 0)) -;;; Generated autoloads from org-pcomplete.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-pcomplete" '("pcomplete/org-mode/" "org-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "org-plot" "org-plot.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-plot.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-plot" '("org-plot"))) - -;;;*** - -;;;### (autoloads nil "org-protocol" "org-protocol.el" (0 0 0 0)) -;;; Generated autoloads from org-protocol.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-protocol" '("org-protocol-"))) - -;;;*** - -;;;### (autoloads nil "org-rmail" "org-rmail.el" (0 0 0 0)) -;;; Generated autoloads from org-rmail.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-rmail" '("org-rmail-"))) - -;;;*** - -;;;### (autoloads nil "org-src" "org-src.el" (0 0 0 0)) -;;; Generated autoloads from org-src.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-src" '("org-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "org-table" "org-table.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-table.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-table" '("org"))) - -;;;*** - -;;;### (autoloads nil "org-tempo" "org-tempo.el" (0 0 0 0)) -;;; Generated autoloads from org-tempo.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-tempo" '("org-tempo-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "org-timer" "org-timer.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-timer.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-timer" '("org-timer-"))) - -;;;*** - -;;;### (autoloads nil "org-version" "org-version.el" (0 0 0 0)) +;;;### (autoloads nil "org-version" "org-version.el" (23994 42575 +;;;;;; 346718 252000)) ;;; Generated autoloads from org-version.el (autoload 'org-release "org-version" "\ @@ -1359,118 +782,33 @@ The location of ODT styles.") ;;;*** -;;;### (autoloads nil "org-w3m" "org-w3m.el" (0 0 0 0)) -;;; Generated autoloads from org-w3m.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-w3m" '("org-w3m-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox" "ox.el" (0 -;;;;;; 0 0 0)) -;;; Generated autoloads from ox.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox" '("org-export-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-ascii" "ox-ascii.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-ascii.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-ascii" '("org-ascii-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-beamer" "ox-beamer.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-beamer.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-beamer" '("org-beamer-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-html" "ox-html.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-html.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-html" '("org-html-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-icalendar" -;;;;;; "ox-icalendar.el" (0 0 0 0)) -;;; Generated autoloads from ox-icalendar.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-icalendar" '("org-icalendar-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-latex" "ox-latex.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-latex.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-latex" '("org-latex-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-man" "ox-man.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-man.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-man" '("org-man-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-md" "ox-md.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-md.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-md" '("org-md-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-odt" "ox-odt.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-odt.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-odt" '("org-odt-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-org" "ox-org.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-org.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-org" '("org-org-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-publish" "ox-publish.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-publish.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-publish" '("org-publish-"))) - -;;;*** - -;;;### (autoloads "actual autoloads are elsewhere" "ox-texinfo" "ox-texinfo.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from ox-texinfo.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-texinfo" '("org-texinfo-"))) - -;;;*** - -;;;### (autoloads nil nil ("ob-core.el" "ob-keys.el" "ob-lob.el" -;;;;;; "ob-matlab.el" "ob-tangle.el" "ob.el" "org-archive.el" "org-attach.el" -;;;;;; "org-bbdb.el" "org-clock.el" "org-datetree.el" "org-element.el" -;;;;;; "org-feed.el" "org-footnote.el" "org-id.el" "org-indent.el" -;;;;;; "org-install.el" "org-irc.el" "org-loaddefs.el" "org-mobile.el" -;;;;;; "org-pkg.el" "org-plot.el" "org-table.el" "org-timer.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") (0 0 0 0)) +;;;### (autoloads nil nil ("ob-C.el" "ob-J.el" "ob-R.el" "ob-abc.el" +;;;;;; "ob-asymptote.el" "ob-awk.el" "ob-calc.el" "ob-clojure.el" +;;;;;; "ob-comint.el" "ob-coq.el" "ob-core.el" "ob-css.el" "ob-ditaa.el" +;;;;;; "ob-dot.el" "ob-ebnf.el" "ob-emacs-lisp.el" "ob-eval.el" +;;;;;; "ob-exp.el" "ob-forth.el" "ob-fortran.el" "ob-gnuplot.el" +;;;;;; "ob-groovy.el" "ob-haskell.el" "ob-hledger.el" "ob-io.el" +;;;;;; "ob-java.el" "ob-js.el" "ob-keys.el" "ob-latex.el" "ob-ledger.el" +;;;;;; "ob-lilypond.el" "ob-lisp.el" "ob-lob.el" "ob-lua.el" "ob-makefile.el" +;;;;;; "ob-matlab.el" "ob-maxima.el" "ob-mscgen.el" "ob-ocaml.el" +;;;;;; "ob-octave.el" "ob-org.el" "ob-perl.el" "ob-picolisp.el" +;;;;;; "ob-plantuml.el" "ob-processing.el" "ob-python.el" "ob-ref.el" +;;;;;; "ob-ruby.el" "ob-sass.el" "ob-scheme.el" "ob-screen.el" "ob-sed.el" +;;;;;; "ob-shell.el" "ob-shen.el" "ob-sql.el" "ob-sqlite.el" "ob-stan.el" +;;;;;; "ob-table.el" "ob-tangle.el" "ob-vala.el" "ob.el" "org-archive.el" +;;;;;; "org-attach.el" "org-bbdb.el" "org-bibtex.el" "org-clock.el" +;;;;;; "org-crypt.el" "org-ctags.el" "org-datetree.el" "org-docview.el" +;;;;;; "org-element.el" "org-entities.el" "org-eshell.el" "org-eww.el" +;;;;;; "org-faces.el" "org-feed.el" "org-footnote.el" "org-gnus.el" +;;;;;; "org-habit.el" "org-id.el" "org-indent.el" "org-info.el" +;;;;;; "org-inlinetask.el" "org-install.el" "org-irc.el" "org-list.el" +;;;;;; "org-loaddefs.el" "org-macro.el" "org-mhe.el" "org-mobile.el" +;;;;;; "org-mouse.el" "org-pcomplete.el" "org-pkg.el" "org-plot.el" +;;;;;; "org-protocol.el" "org-rmail.el" "org-src.el" "org-table.el" +;;;;;; "org-tempo.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") (23994 42575 381500 755000)) ;;;*** @@ -1478,6 +816,5 @@ The location of ODT styles.") ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; org-autoloads.el ends here diff --git a/elpa/org-20190930/org-bbdb.el b/elpa/org-20191028/org-bbdb.el similarity index 100% rename from elpa/org-20190930/org-bbdb.el rename to elpa/org-20191028/org-bbdb.el diff --git a/elpa/org-20190930/org-bibtex.el b/elpa/org-20191028/org-bibtex.el similarity index 100% rename from elpa/org-20190930/org-bibtex.el rename to elpa/org-20191028/org-bibtex.el diff --git a/elpa/org-20190930/org-capture.el b/elpa/org-20191028/org-capture.el similarity index 100% rename from elpa/org-20190930/org-capture.el rename to elpa/org-20191028/org-capture.el diff --git a/elpa/org-20190930/org-clock.el b/elpa/org-20191028/org-clock.el similarity index 99% rename from elpa/org-20190930/org-clock.el rename to elpa/org-20191028/org-clock.el index d0548d00..1761f693 100644 --- a/elpa/org-20190930/org-clock.el +++ b/elpa/org-20191028/org-clock.el @@ -2054,7 +2054,7 @@ in the buffer and update it." (org-update-dblock)) (defun org-day-of-week (day month year) - "Returns the day of the week as an integer." + "Return the day of the week as an integer." (nth 6 (decode-time (date-to-time diff --git a/elpa/org-20190930/org-colview.el b/elpa/org-20191028/org-colview.el similarity index 100% rename from elpa/org-20190930/org-colview.el rename to elpa/org-20191028/org-colview.el diff --git a/elpa/org-20190930/org-compat.el b/elpa/org-20191028/org-compat.el similarity index 100% rename from elpa/org-20190930/org-compat.el rename to elpa/org-20191028/org-compat.el diff --git a/elpa/org-20190930/org-crypt.el b/elpa/org-20191028/org-crypt.el similarity index 100% rename from elpa/org-20190930/org-crypt.el rename to elpa/org-20191028/org-crypt.el diff --git a/elpa/org-20190930/org-ctags.el b/elpa/org-20191028/org-ctags.el similarity index 100% rename from elpa/org-20190930/org-ctags.el rename to elpa/org-20191028/org-ctags.el diff --git a/elpa/org-20190930/org-datetree.el b/elpa/org-20191028/org-datetree.el similarity index 100% rename from elpa/org-20190930/org-datetree.el rename to elpa/org-20191028/org-datetree.el diff --git a/elpa/org-20190930/org-docview.el b/elpa/org-20191028/org-docview.el similarity index 100% rename from elpa/org-20190930/org-docview.el rename to elpa/org-20191028/org-docview.el diff --git a/elpa/org-20190930/org-duration.el b/elpa/org-20191028/org-duration.el similarity index 100% rename from elpa/org-20190930/org-duration.el rename to elpa/org-20191028/org-duration.el diff --git a/elpa/org-20190930/org-element.el b/elpa/org-20191028/org-element.el similarity index 100% rename from elpa/org-20190930/org-element.el rename to elpa/org-20191028/org-element.el diff --git a/elpa/org-20190930/org-entities.el b/elpa/org-20191028/org-entities.el similarity index 100% rename from elpa/org-20190930/org-entities.el rename to elpa/org-20191028/org-entities.el diff --git a/elpa/org-20190930/org-eshell.el b/elpa/org-20191028/org-eshell.el similarity index 100% rename from elpa/org-20190930/org-eshell.el rename to elpa/org-20191028/org-eshell.el diff --git a/elpa/org-20190930/org-eww.el b/elpa/org-20191028/org-eww.el similarity index 100% rename from elpa/org-20190930/org-eww.el rename to elpa/org-20191028/org-eww.el diff --git a/elpa/org-20190930/org-faces.el b/elpa/org-20191028/org-faces.el similarity index 100% rename from elpa/org-20190930/org-faces.el rename to elpa/org-20191028/org-faces.el diff --git a/elpa/org-20190930/org-feed.el b/elpa/org-20191028/org-feed.el similarity index 100% rename from elpa/org-20190930/org-feed.el rename to elpa/org-20191028/org-feed.el diff --git a/elpa/org-20190930/org-footnote.el b/elpa/org-20191028/org-footnote.el similarity index 100% rename from elpa/org-20190930/org-footnote.el rename to elpa/org-20191028/org-footnote.el diff --git a/elpa/org-20190930/org-gnus.el b/elpa/org-20191028/org-gnus.el similarity index 100% rename from elpa/org-20190930/org-gnus.el rename to elpa/org-20191028/org-gnus.el diff --git a/elpa/org-20190930/org-goto.el b/elpa/org-20191028/org-goto.el similarity index 100% rename from elpa/org-20190930/org-goto.el rename to elpa/org-20191028/org-goto.el diff --git a/elpa/org-20190930/org-habit.el b/elpa/org-20191028/org-habit.el similarity index 100% rename from elpa/org-20190930/org-habit.el rename to elpa/org-20191028/org-habit.el diff --git a/elpa/org-20190930/org-id.el b/elpa/org-20191028/org-id.el similarity index 100% rename from elpa/org-20190930/org-id.el rename to elpa/org-20191028/org-id.el diff --git a/elpa/org-20190930/org-indent.el b/elpa/org-20191028/org-indent.el similarity index 100% rename from elpa/org-20190930/org-indent.el rename to elpa/org-20191028/org-indent.el diff --git a/elpa/org-20190930/org-info.el b/elpa/org-20191028/org-info.el similarity index 100% rename from elpa/org-20190930/org-info.el rename to elpa/org-20191028/org-info.el diff --git a/elpa/org-20190930/org-inlinetask.el b/elpa/org-20191028/org-inlinetask.el similarity index 100% rename from elpa/org-20190930/org-inlinetask.el rename to elpa/org-20191028/org-inlinetask.el diff --git a/elpa/org-20190930/org-install.el b/elpa/org-20191028/org-install.el similarity index 100% rename from elpa/org-20190930/org-install.el rename to elpa/org-20191028/org-install.el diff --git a/elpa/org-20190930/org-irc.el b/elpa/org-20191028/org-irc.el similarity index 100% rename from elpa/org-20190930/org-irc.el rename to elpa/org-20191028/org-irc.el diff --git a/elpa/org-20190930/org-lint.el b/elpa/org-20191028/org-lint.el similarity index 100% rename from elpa/org-20190930/org-lint.el rename to elpa/org-20191028/org-lint.el diff --git a/elpa/org-20190930/org-list.el b/elpa/org-20191028/org-list.el similarity index 100% rename from elpa/org-20190930/org-list.el rename to elpa/org-20191028/org-list.el diff --git a/elpa/org-20190930/org-loaddefs.el b/elpa/org-20191028/org-loaddefs.el similarity index 98% rename from elpa/org-20190930/org-loaddefs.el rename to elpa/org-20191028/org-loaddefs.el index fbd6472f..19914011 100644 --- a/elpa/org-20190930/org-loaddefs.el +++ b/elpa/org-20191028/org-loaddefs.el @@ -72,7 +72,7 @@ ;;;*** -;;;### (autoloads nil "ob-core" "ob-core.el" (0 0 0 0)) +;;;### (autoloads nil "ob-core" "ob-core.el" "87f73d5013f14a433b1c853819ea720e") ;;; Generated autoloads from ob-core.el (autoload 'org-babel-execute-safely-maybe "ob-core" "\ @@ -304,8 +304,6 @@ Mark current source block. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-core" '("org-"))) - ;;;*** ;;;### (autoloads nil "ob-css" "ob-css.el" (0 0 0 0)) @@ -420,7 +418,7 @@ Mark current source block. ;;;*** -;;;### (autoloads nil "ob-keys" "ob-keys.el" (0 0 0 0)) +;;;### (autoloads nil "ob-keys" "ob-keys.el" "11cd5f8e17581b5dd5e8d3f199ad620d") ;;; Generated autoloads from ob-keys.el (autoload 'org-babel-describe-bindings "ob-keys" "\ @@ -428,8 +426,6 @@ Describe all keybindings behind `org-babel-key-prefix'. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-keys" '("org-babel-"))) - ;;;*** ;;;### (autoloads nil "ob-latex" "ob-latex.el" (0 0 0 0)) @@ -460,7 +456,7 @@ Describe all keybindings behind `org-babel-key-prefix'. ;;;*** -;;;### (autoloads nil "ob-lob" "ob-lob.el" (0 0 0 0)) +;;;### (autoloads nil "ob-lob" "ob-lob.el" "6727aa97a79646b6da1990eed6bf61e3") ;;; Generated autoloads from ob-lob.el (autoload 'org-babel-lob-execute-maybe "ob-lob" "\ @@ -481,8 +477,6 @@ see. \(fn &optional DATUM)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lob" '("org-babel-"))) - ;;;*** ;;;### (autoloads nil "ob-lua" "ob-lua.el" (0 0 0 0)) @@ -653,7 +647,7 @@ see. ;;;*** -;;;### (autoloads nil "ob-tangle" "ob-tangle.el" (0 0 0 0)) +;;;### (autoloads nil "ob-tangle" "ob-tangle.el" "82fc18eb309529449fdc9b62a6acdedb") ;;; Generated autoloads from ob-tangle.el (autoload 'org-babel-tangle-file "ob-tangle" "\ @@ -679,8 +673,6 @@ used to limit the exported source code blocks by language. \(fn &optional ARG TARGET-FILE LANG)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-tangle" '("org-babel-"))) - ;;;*** ;;;### (autoloads nil "ob-vala" "ob-vala.el" (0 0 0 0)) @@ -968,7 +960,7 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-archive" "org-archive.el" (0 0 0 0)) +;;;### (autoloads nil "org-archive" "org-archive.el" "a05928aac4856608117e562dec97e234") ;;; Generated autoloads from org-archive.el (autoload 'org-add-archive-files "org-archive" "\ @@ -1026,11 +1018,9 @@ This command is set with the variable `org-archive-default-command'. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-archive" '("org-a"))) - ;;;*** -;;;### (autoloads nil "org-attach" "org-attach.el" (0 0 0 0)) +;;;### (autoloads nil "org-attach" "org-attach.el" "3b5c015d85e41fc877981506897ab7e5") ;;; Generated autoloads from org-attach.el (autoload 'org-attach "org-attach" "\ @@ -1047,11 +1037,9 @@ Idea taken from `gnus-dired-attach'. \(fn FILES)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-attach" '("org-attach-"))) - ;;;*** -;;;### (autoloads nil "org-bbdb" "org-bbdb.el" (0 0 0 0)) +;;;### (autoloads nil "org-bbdb" "org-bbdb.el" "0b09ebf1301e91f5dcf98ab339378255") ;;; Generated autoloads from org-bbdb.el (autoload 'org-bbdb-anniversaries "org-bbdb" "\ @@ -1059,8 +1047,6 @@ Extract anniversaries from BBDB for display in the agenda. \(fn)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-bbdb" '("org-bbdb-"))) - ;;;*** ;;;### (autoloads nil "org-bibtex" "org-bibtex.el" (0 0 0 0)) @@ -1118,7 +1104,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-clock" "org-clock.el" (0 0 0 0)) +;;;### (autoloads nil "org-clock" "org-clock.el" "09e036675a771d7f456be4c9cfd7ace1") ;;; Generated autoloads from org-clock.el (autoload 'org-resolve-clocks "org-clock" "\ @@ -1271,8 +1257,6 @@ Otherwise, return nil. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-clock" '("org-"))) - ;;;*** ;;;### (autoloads nil "org-colview" "org-colview.el" (0 0 0 0)) @@ -1401,7 +1385,7 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-datetree" "org-datetree.el" (0 0 0 0)) +;;;### (autoloads nil "org-datetree" "org-datetree.el" "774ad6e1857fe8931bc781835a24a290") ;;; Generated autoloads from org-datetree.el (autoload 'org-datetree-find-date-create "org-datetree" "\ @@ -1423,8 +1407,6 @@ will be built under the headline at point. \(fn D &optional KEEP-RESTRICTION)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-datetree" '("org-datetree-"))) - ;;;*** ;;;### (autoloads nil "org-docview" "org-docview.el" (0 0 0 0)) @@ -1490,7 +1472,7 @@ with \"H:MM:SS\" format, return `h:mm:ss'. Otherwise, return ;;;*** -;;;### (autoloads nil "org-element" "org-element.el" (0 0 0 0)) +;;;### (autoloads nil "org-element" "org-element.el" "8eae44e6e665b0f8351a629596de0f23") ;;; Generated autoloads from org-element.el (autoload 'org-element-update-syntax "org-element" "\ @@ -1560,8 +1542,6 @@ Providing it allows for quicker computation. \(fn &optional ELEMENT)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-element" '("org-element-"))) - ;;;*** ;;;### (autoloads nil "org-entities" "org-entities.el" (0 0 0 0)) @@ -1592,7 +1572,7 @@ Providing it allows for quicker computation. ;;;*** -;;;### (autoloads nil "org-feed" "org-feed.el" (0 0 0 0)) +;;;### (autoloads nil "org-feed" "org-feed.el" "09d3f3b37609f33ffa8ab4674b169e5d") ;;; Generated autoloads from org-feed.el (autoload 'org-feed-update-all "org-feed" "\ @@ -1617,11 +1597,9 @@ Show the raw feed buffer of a feed. \(fn FEED)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-feed" '("org-feed-"))) - ;;;*** -;;;### (autoloads nil "org-footnote" "org-footnote.el" (0 0 0 0)) +;;;### (autoloads nil "org-footnote" "org-footnote.el" "b41d3db2b6aa12632b8bdeafb28990e6") ;;; Generated autoloads from org-footnote.el (autoload 'org-footnote-action "org-footnote" "\ @@ -1640,8 +1618,6 @@ offer additional commands in a menu. \(fn &optional SPECIAL)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-footnote" '("org-footnote-"))) - ;;;*** ;;;### (autoloads nil "org-gnus" "org-gnus.el" (0 0 0 0)) @@ -1694,7 +1670,7 @@ With a prefix argument, use the alternative interface: e.g., if ;;;*** -;;;### (autoloads nil "org-id" "org-id.el" (0 0 0 0)) +;;;### (autoloads nil "org-id" "org-id.el" "74449482184943877eb07f3d613161b0") ;;; Generated autoloads from org-id.el (autoload 'org-id-get-create "org-id" "\ @@ -1784,21 +1760,14 @@ Store a link to the current entry, using its ID. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-id" '("org-id-"))) - ;;;*** -;;;### (autoloads nil "org-indent" "org-indent.el" (0 0 0 0)) +;;;### (autoloads nil "org-indent" "org-indent.el" "65830b3f864eb27e88fb85cea5eb1530") ;;; Generated autoloads from org-indent.el (autoload 'org-indent-mode "org-indent" "\ When active, indent text according to outline structure. -If called interactively, enable Org-Indent mode if ARG is positive, and -disable it if ARG is zero or negative. If called from Lisp, -also enable the mode if ARG is omitted or nil, and toggle it -if ARG is `toggle'; disable the mode otherwise. - Internally this works by adding `line-prefix' and `wrap-prefix' properties, after each buffer modification, on the modified zone. @@ -1808,8 +1777,6 @@ during idle time. \(fn &optional ARG)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-indent" '("org-"))) - ;;;*** ;;;### (autoloads nil "org-info" "org-info.el" (0 0 0 0)) @@ -1827,7 +1794,7 @@ during idle time. ;;;*** -;;;### (autoloads nil "org-irc" "org-irc.el" (0 0 0 0)) +;;;### (autoloads nil "org-irc" "org-irc.el" "9388cd8fe8782551d200da0772c56a00") ;;; Generated autoloads from org-irc.el (autoload 'org-irc-store-link "org-irc" "\ @@ -1835,8 +1802,6 @@ Dispatch to the appropriate function to store a link to an IRC session. \(fn)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-irc" '("org-irc-"))) - ;;;*** ;;;### (autoloads nil "org-lint" "org-lint.el" (0 0 0 0)) @@ -3019,7 +2984,7 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "ox" "ox.el" "9c5401ffd412922a5c0d1912ea6687fe") +;;;### (autoloads nil "ox" "ox.el" "5c180fcee4218ffa29d079c74fe98a1e") ;;; Generated autoloads from ox.el (autoload 'org-export-get-backend "ox" "\ diff --git a/elpa/org-20190930/org-macro.el b/elpa/org-20191028/org-macro.el similarity index 100% rename from elpa/org-20190930/org-macro.el rename to elpa/org-20191028/org-macro.el diff --git a/elpa/org-20190930/org-macs.el b/elpa/org-20191028/org-macs.el similarity index 100% rename from elpa/org-20190930/org-macs.el rename to elpa/org-20191028/org-macs.el diff --git a/elpa/org-20190930/org-mhe.el b/elpa/org-20191028/org-mhe.el similarity index 100% rename from elpa/org-20190930/org-mhe.el rename to elpa/org-20191028/org-mhe.el diff --git a/elpa/org-20190930/org-mobile.el b/elpa/org-20191028/org-mobile.el similarity index 100% rename from elpa/org-20190930/org-mobile.el rename to elpa/org-20191028/org-mobile.el diff --git a/elpa/org-20190930/org-mouse.el b/elpa/org-20191028/org-mouse.el similarity index 100% rename from elpa/org-20190930/org-mouse.el rename to elpa/org-20191028/org-mouse.el diff --git a/elpa/org-20190930/org-pcomplete.el b/elpa/org-20191028/org-pcomplete.el similarity index 100% rename from elpa/org-20190930/org-pcomplete.el rename to elpa/org-20191028/org-pcomplete.el diff --git a/elpa/org-20190930/org-pkg.el b/elpa/org-20191028/org-pkg.el similarity index 53% rename from elpa/org-20190930/org-pkg.el rename to elpa/org-20191028/org-pkg.el index b3683663..21a9db6f 100644 --- a/elpa/org-20190930/org-pkg.el +++ b/elpa/org-20191028/org-pkg.el @@ -1,5 +1,5 @@ (define-package "org" - "20190930" "Outline-based notes management and organizer" ( )) + "20191028" "Outline-based notes management and organizer" ( )) ;; Local Variables: ;; no-byte-compile: t ;; End: diff --git a/elpa/org-20190930/org-plot.el b/elpa/org-20191028/org-plot.el similarity index 100% rename from elpa/org-20190930/org-plot.el rename to elpa/org-20191028/org-plot.el diff --git a/elpa/org-20190930/org-protocol.el b/elpa/org-20191028/org-protocol.el similarity index 100% rename from elpa/org-20190930/org-protocol.el rename to elpa/org-20191028/org-protocol.el diff --git a/elpa/org-20190930/org-rmail.el b/elpa/org-20191028/org-rmail.el similarity index 100% rename from elpa/org-20190930/org-rmail.el rename to elpa/org-20191028/org-rmail.el diff --git a/elpa/org-20190930/org-src.el b/elpa/org-20191028/org-src.el similarity index 100% rename from elpa/org-20190930/org-src.el rename to elpa/org-20191028/org-src.el diff --git a/elpa/org-20190930/org-table.el b/elpa/org-20191028/org-table.el similarity index 100% rename from elpa/org-20190930/org-table.el rename to elpa/org-20191028/org-table.el diff --git a/elpa/org-20190930/org-tempo.el b/elpa/org-20191028/org-tempo.el similarity index 100% rename from elpa/org-20190930/org-tempo.el rename to elpa/org-20191028/org-tempo.el diff --git a/elpa/org-20190930/org-timer.el b/elpa/org-20191028/org-timer.el similarity index 100% rename from elpa/org-20190930/org-timer.el rename to elpa/org-20191028/org-timer.el diff --git a/elpa/org-20190930/org-version.el b/elpa/org-20191028/org-version.el similarity index 92% rename from elpa/org-20190930/org-version.el rename to elpa/org-20191028/org-version.el index a6256e32..2b12ec9e 100644 --- a/elpa/org-20190930/org-version.el +++ b/elpa/org-20191028/org-version.el @@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made." (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "9.2.6-4-ge30905-elpa")) + (let ((org-git-version "9.2.6-5-g9c611f-elpa")) org-git-version)) ;;;###autoload (defvar org-odt-data-dir "/usr/share/emacs/etc/org" diff --git a/elpa/org-20190930/org-w3m.el b/elpa/org-20191028/org-w3m.el similarity index 100% rename from elpa/org-20190930/org-w3m.el rename to elpa/org-20191028/org-w3m.el diff --git a/elpa/org-20190930/org.el b/elpa/org-20191028/org.el similarity index 100% rename from elpa/org-20190930/org.el rename to elpa/org-20191028/org.el diff --git a/elpa/org-plus-contrib-20190930/orgcard.pdf b/elpa/org-20191028/orgcard.pdf similarity index 99% rename from elpa/org-plus-contrib-20190930/orgcard.pdf rename to elpa/org-20191028/orgcard.pdf index 9e256dec6cb2a8a39b9662745943605e8c25294c..494f3f0cf2782dd5018a758c3ad5ae3353d94d4a 100644 GIT binary patch delta 117 zcmdlopMA@G_J%Et;>WlQ4U8-dfWXjjy5ccLVI=-`yJL)g9L{dWCT8X)CT_+~ZkDcQ hF0MvyZieP&&Q6YIZjP?TrWSSzHiVQ+KYxz#DF8KNA6NhY delta 117 zcmdlopMA@G_J%Et;>WlQER79-z{tpWy5ccLVI=-`yJL)g9L^TTZe|uPrmp6$t_E(- hE(T7HP9}y1&PE2VrY1(F7H)P5HiVQ+KYxz#DF8D>9~J-r diff --git a/elpa/org-20190930/ox-ascii.el b/elpa/org-20191028/ox-ascii.el similarity index 100% rename from elpa/org-20190930/ox-ascii.el rename to elpa/org-20191028/ox-ascii.el diff --git a/elpa/org-20190930/ox-beamer.el b/elpa/org-20191028/ox-beamer.el similarity index 100% rename from elpa/org-20190930/ox-beamer.el rename to elpa/org-20191028/ox-beamer.el diff --git a/elpa/org-20190930/ox-html.el b/elpa/org-20191028/ox-html.el similarity index 100% rename from elpa/org-20190930/ox-html.el rename to elpa/org-20191028/ox-html.el diff --git a/elpa/org-20190930/ox-icalendar.el b/elpa/org-20191028/ox-icalendar.el similarity index 100% rename from elpa/org-20190930/ox-icalendar.el rename to elpa/org-20191028/ox-icalendar.el diff --git a/elpa/org-20190930/ox-latex.el b/elpa/org-20191028/ox-latex.el similarity index 100% rename from elpa/org-20190930/ox-latex.el rename to elpa/org-20191028/ox-latex.el diff --git a/elpa/org-20190930/ox-man.el b/elpa/org-20191028/ox-man.el similarity index 100% rename from elpa/org-20190930/ox-man.el rename to elpa/org-20191028/ox-man.el diff --git a/elpa/org-20190930/ox-md.el b/elpa/org-20191028/ox-md.el similarity index 100% rename from elpa/org-20190930/ox-md.el rename to elpa/org-20191028/ox-md.el diff --git a/elpa/org-20190930/ox-odt.el b/elpa/org-20191028/ox-odt.el similarity index 100% rename from elpa/org-20190930/ox-odt.el rename to elpa/org-20191028/ox-odt.el diff --git a/elpa/org-20190930/ox-org.el b/elpa/org-20191028/ox-org.el similarity index 100% rename from elpa/org-20190930/ox-org.el rename to elpa/org-20191028/ox-org.el diff --git a/elpa/org-20190930/ox-publish.el b/elpa/org-20191028/ox-publish.el similarity index 100% rename from elpa/org-20190930/ox-publish.el rename to elpa/org-20191028/ox-publish.el diff --git a/elpa/org-20190930/ox-texinfo.el b/elpa/org-20191028/ox-texinfo.el similarity index 100% rename from elpa/org-20190930/ox-texinfo.el rename to elpa/org-20191028/ox-texinfo.el diff --git a/elpa/org-20190930/ox.el b/elpa/org-20191028/ox.el similarity index 99% rename from elpa/org-20190930/ox.el rename to elpa/org-20191028/ox.el index ec9527fb..c02a6c44 100644 --- a/elpa/org-20190930/ox.el +++ b/elpa/org-20191028/ox.el @@ -4757,7 +4757,7 @@ code." ;;;; For Tables ;; -;; `org-export-table-has-special-column-p' and and +;; `org-export-table-has-special-column-p' and ;; `org-export-table-row-is-special-p' are predicates used to look for ;; meta-information about the table structure. ;; diff --git a/elpa/org-chef-20181202.2221/org-chef-autoloads.el b/elpa/org-chef-20181202.2221/org-chef-autoloads.el deleted file mode 100644 index 9cd8eda7..00000000 --- a/elpa/org-chef-20181202.2221/org-chef-autoloads.el +++ /dev/null @@ -1,146 +0,0 @@ -;;; org-chef-autoloads.el --- automatically extracted autoloads -;; -;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - - -;;;### (autoloads nil "org-chef" "org-chef.el" (0 0 0 0)) -;;; Generated autoloads from org-chef.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef" '("org-chef-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-all-recipes" "org-chef-all-recipes.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-all-recipes.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-all-recipes" '("org-chef-all-recipes-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-budget-bytes" "org-chef-budget-bytes.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-budget-bytes.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-budget-bytes" '("org-chef-budget-bytes-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-chef-koch" "org-chef-chef-koch.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-chef-koch.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-chef-koch" '("org-chef-chef-koch-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-cultures-for-health" "org-chef-cultures-for-health.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-cultures-for-health.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-cultures-for-health" '("org-chef-cultures-for-health-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-genius-kitchen" "org-chef-genius-kitchen.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-genius-kitchen.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-genius-kitchen" '("org-chef-genius-kitchen-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-marmiton" "org-chef-marmiton.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-marmiton.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-marmiton" '("org-chef-marmiton-" "extract-dom-text" "sanitize"))) - -;;;*** - -;;;### (autoloads nil "org-chef-martha-stewart" "org-chef-martha-stewart.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-martha-stewart.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-martha-stewart" '("org-chef-martha-stewart-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-nytimes" "org-chef-nytimes.el" (0 -;;;;;; 0 0 0)) -;;; Generated autoloads from org-chef-nytimes.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-nytimes" '("org-chef-nytimes-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-reluctant-gourmet" "org-chef-reluctant-gourmet.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-reluctant-gourmet.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-reluctant-gourmet" '("org-chef-reluctant-gourmet-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-saveur" "org-chef-saveur.el" (0 0 -;;;;;; 0 0)) -;;; Generated autoloads from org-chef-saveur.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-saveur" '("org-chef-saveur-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-serious-eats" "org-chef-serious-eats.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-serious-eats.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-serious-eats" '("org-chef-serious-eats-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-simply-recipes" "org-chef-simply-recipes.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-simply-recipes.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-simply-recipes" '("org-chef-simply-recipes-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-steamy-kitchen" "org-chef-steamy-kitchen.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-steamy-kitchen.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-steamy-kitchen" '("org-chef-steamy-kitchen-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-utils" "org-chef-utils.el" (0 0 0 -;;;;;; 0)) -;;; Generated autoloads from org-chef-utils.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-utils" '("org-chef-"))) - -;;;*** - -;;;### (autoloads nil "org-chef-wordpress" "org-chef-wordpress.el" -;;;;;; (0 0 0 0)) -;;; Generated autoloads from org-chef-wordpress.el - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-chef-wordpress" '("org-chef-"))) - -;;;*** - -;;;### (autoloads nil nil ("org-chef-pkg.el") (0 0 0 0)) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; coding: utf-8 -;; End: -;;; org-chef-autoloads.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef-budget-bytes.el b/elpa/org-chef-20181202.2221/org-chef-budget-bytes.el deleted file mode 100644 index 07f83c7a..00000000 --- a/elpa/org-chef-20181202.2221/org-chef-budget-bytes.el +++ /dev/null @@ -1,121 +0,0 @@ -;;; org-chef-budget-bytes.el --- org-chef budgetbytes fetching. -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Calvin Beck - -;; Author: Calvin Beck -;; URL: https://github.com/Chobbes/org-chef -;; Created: 2018 - -;; Copyright 2018 Calvin Beck - -;; Permission is hereby granted, free of charge, to any person -;; obtaining a copy of this software and associated documentation -;; files (the "Software"), to deal in the Software without -;; restriction, including without limitation the rights to use, copy, -;; modify, merge, publish, distribute, sublicense, and/or sell copies -;; of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: - -;; The above copyright notice and this permission notice shall be -;; included in all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -;; SOFTWARE. - -;;; Commentary: - -;; Functions for fetching information from budgetbytes.com. - -;;; Code: - - -(require 'org-chef-utils) -(require 'dom) - - -(defun org-chef-budget-bytes-extract-name (dom) - "Get the name of a recipe from an budgetbytes DOM." - (dom-text (car (dom-by-class dom "^wprm-recipe-name$")))) - - -(defun org-chef-budget-bytes-ingredient-to-string (dom) - (let* ((amount (string-trim (dom-text (car (dom-by-class dom "wprm-recipe-ingredient-amount"))))) - (unit (string-trim (dom-text (car (dom-by-class dom "wprm-recipe-ingredient-unit"))))) - (name (string-trim (dom-text (car (dom-by-class dom "wprm-recipe-ingredient-name")))))) - (format "%s %s %s" amount unit name))) - - -(defun org-chef-budget-bytes-extract-ingredients (dom) - "Get the ingredients for a recipe from an budgetbytes DOM." - (mapcar #'(lambda (n) (org-chef-budget-bytes-ingredient-to-string n)) - (dom-by-class dom "^wprm-recipe-ingredient$"))) - - -(defun org-chef-budget-bytes-extract-servings (dom) - "Get the number of servings for a recipe from an budgetbytes DOM." - (dom-text (car (dom-by-class dom "wprm-recipe-servings$")))) - - -(defun org-chef-budget-bytes-time-to-string (dom) - (let* ((hours (string-trim (dom-text (car (dom-by-class dom "hours$"))))) - (minutes (string-trim (dom-text (car (dom-by-class dom "minutes$"))))) - (hour-string (if (/= (length hours) 0) (format "%s hours " hours) "")) - (minute-string (if (/= (length minutes) 0) (format "%s minutes" minutes) ""))) - (string-trim (concat hour-string minute-string)))) - - -(defun org-chef-budget-bytes-extract-prep-time (dom) - "Get the amount of prep-time for a recipe from an budgetbytes DOM." - (org-chef-budget-bytes-time-to-string (car (dom-by-class dom "wprm-recipe-prep-time-container")))) - - -(defun org-chef-budget-bytes-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from an budgetbytes DOM." - (org-chef-budget-bytes-time-to-string (car (dom-by-class dom "wprm-recipe-cook-time-container")))) - - -(defun org-chef-budget-bytes-extract-ready-in (dom) - "Get the total amount of time for a recipe from an budgetbytes DOM." - (org-chef-budget-bytes-time-to-string (car (dom-by-class dom "wprm-recipe-total-time-container")))) - - -(defun org-chef-budget-bytes-extract-directions (dom) - "Get the directions for a recipe from an budgetbytes DOM." - (mapcar #'(lambda (n) (string-trim (dom-texts n))) - (dom-by-class dom "wprm-recipe-instruction-text"))) - - -(defun org-chef-budget-bytes-fetch (url) - "Given an budgetbytes.com URL, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions -- source-url" - (with-current-buffer (url-retrieve-synchronously url) - (let ((dom (libxml-parse-html-region (point-min) (point-max)))) - - `((name . ,(org-chef-budget-bytes-extract-name dom)) - (ingredients . ,(org-chef-budget-bytes-extract-ingredients dom)) - (servings . ,(org-chef-budget-bytes-extract-servings dom)) - (prep-time . ,(org-chef-budget-bytes-extract-prep-time dom)) - (cook-time . ,(org-chef-budget-bytes-extract-cook-time dom)) - (ready-in . ,(org-chef-budget-bytes-extract-ready-in dom)) - (directions . ,(org-chef-budget-bytes-extract-directions dom)) - (source-url . ,url))))) - - -(provide 'org-chef-budget-bytes) -;;; org-chef-budget-bytes.el ends here diff --git a/elpa/org-chef-20191017.2015/org-chef-24kitchen.el b/elpa/org-chef-20191017.2015/org-chef-24kitchen.el new file mode 100644 index 00000000..59eeb710 --- /dev/null +++ b/elpa/org-chef-20191017.2015/org-chef-24kitchen.el @@ -0,0 +1,90 @@ +;;; org-chef-24kitchen.el --- org-chef 24kitchen fetching. -*- lexical-binding: t; -*- + +;; Copyright (C) 2019 Calvin Beck, Folkert van der Beek + +;; Author: Folkert van der Beek +;; URL: https://github.com/Chobbes/org-chef +;; Created: 2019 + +;; Copyright 2019 Folkert van der Beek + +;; Permission is hereby granted, free of charge, to any person +;; obtaining a copy of this software and associated documentation +;; files (the "Software"), to deal in the Software without +;; restriction, including without limitation the rights to use, copy, +;; modify, merge, publish, distribute, sublicense, and/or sell copies +;; of the Software, and to permit persons to whom the Software is +;; furnished to do so, subject to the following conditions: + +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. + +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +;; SOFTWARE. + +;;; Commentary: + +;; Functions for fetching information from 24kitchen.nl. + +;;; Code: + +(require 'org-chef-utils) +(require 'dom) + +(defun org-chef-24kitchen-extract-name (dom) + "Get the name of a recipe from an 24kitchen DOM." + (dom-text (dom-children (dom-by-class dom "^page-title$")))) + +(defun org-chef-24kitchen-extract-ingredients (dom) + "Get the ingredients for a recipe from an 24kitchen DOM." + (org-chef-remove-empty-strings (mapcar #'(lambda (node) (string-trim (replace-regexp-in-string "[[:space:]\n]+" " " (dom-texts node)))) (dom-by-class dom "^recipe-component$")))) + +(defun org-chef-24kitchen-extract-servings (dom) + "Get the number of servings for a recipe from an 24kitchen DOM." + (string-trim (dom-text (dom-by-class dom "^portion-amount$")))) + +(defun org-chef-24kitchen-extract-cook-time (dom) + "Get the amount of cook-time for a recipe from an 24kitchen DOM." + (string-trim (dom-text (dom-by-class dom "^cooking-time$")))) + +(defun org-chef-24kitchen-extract-ready-in (dom) + "Get the total amount of time for a recipe from an 24kitchen DOM." + (string-trim (dom-text (dom-by-class dom "^total-time$")))) + +(defun org-chef-24kitchen-extract-directions (dom) + "Get the directions for a recipe from an 24kitchen DOM." + (org-chef-remove-empty-strings (mapcar #'(lambda (node) (string-trim (dom-text node))) (dom-children (cdr (dom-by-class dom "^recipe-body$")))))) + +(defun org-chef-24kitchen-fetch (url) + "Given an 24kitchen.nl URL, retrieve the recipe information. + +This returns an alist with the following keys: + +- name +- ingredients +- servings +- prep-time +- cook-time +- ready-in +- directions +- source-url" + (with-current-buffer (org-chef-url-retrieve-synchronously url) + (let ((dom (libxml-parse-html-region (point-min) (point-max)))) + + `((name . ,(org-chef-24kitchen-extract-name dom)) + (ingredients . ,(org-chef-24kitchen-extract-ingredients dom)) + (servings . ,(org-chef-24kitchen-extract-servings dom)) + (prep-time . "") + (cook-time . ,(org-chef-24kitchen-extract-cook-time dom)) + (ready-in . ,(org-chef-24kitchen-extract-ready-in dom)) + (directions . ,(org-chef-24kitchen-extract-directions dom)) + (source-url . ,url))))) + +(provide 'org-chef-24kitchen) +;;; org-chef-24kitchen.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef-all-recipes.el b/elpa/org-chef-20191017.2015/org-chef-all-recipes.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-all-recipes.el rename to elpa/org-chef-20191017.2015/org-chef-all-recipes.el index 2556af84..ee325d26 100644 --- a/elpa/org-chef-20181202.2221/org-chef-all-recipes.el +++ b/elpa/org-chef-20191017.2015/org-chef-all-recipes.el @@ -87,7 +87,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) `((name . ,(org-chef-all-recipes-extract-name dom)) diff --git a/elpa/org-chef-20191017.2015/org-chef-autoloads.el b/elpa/org-chef-20191017.2015/org-chef-autoloads.el new file mode 100644 index 00000000..a3949314 --- /dev/null +++ b/elpa/org-chef-20191017.2015/org-chef-autoloads.el @@ -0,0 +1,33 @@ +;;; org-chef-autoloads.el --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) + +;;;### (autoloads nil "org-chef" "org-chef.el" (23994 46439 580564 +;;;;;; 163000)) +;;; Generated autoloads from org-chef.el + +(autoload 'org-chef-insert-recipe "org-chef" "\ +Prompt for a recipe URL, and then insert the recipe at point. + +\(fn URL)" t nil) + +;;;*** + +;;;### (autoloads nil nil ("org-chef-24kitchen.el" "org-chef-all-recipes.el" +;;;;;; "org-chef-chef-koch.el" "org-chef-cultures-for-health.el" +;;;;;; "org-chef-fine-cooking.el" "org-chef-genius-kitchen.el" "org-chef-marmiton.el" +;;;;;; "org-chef-martha-stewart.el" "org-chef-nytimes.el" "org-chef-pkg.el" +;;;;;; "org-chef-reluctant-gourmet.el" "org-chef-saveur.el" "org-chef-serious-eats.el" +;;;;;; "org-chef-simply-recipes.el" "org-chef-steamy-kitchen.el" +;;;;;; "org-chef-taste.el" "org-chef-utils.el" "org-chef-wordpress.el" +;;;;;; "org-chef-xiachufang.el") (23994 46439 598811 226000)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; org-chef-autoloads.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef-chef-koch.el b/elpa/org-chef-20191017.2015/org-chef-chef-koch.el similarity index 82% rename from elpa/org-chef-20181202.2221/org-chef-chef-koch.el rename to elpa/org-chef-20191017.2015/org-chef-chef-koch.el index 203931c8..2a6e00c4 100644 --- a/elpa/org-chef-20181202.2221/org-chef-chef-koch.el +++ b/elpa/org-chef-20191017.2015/org-chef-chef-koch.el @@ -40,49 +40,49 @@ (defun org-chef-chef-koch-extract-name (dom) - "Get the name of a recipe from an chefkoch DOM." - (dom-text (car (dom-by-class dom "page-title")))) + "Get the name of a recipe from a chefkoch DOM." + (dom-text (dom-by-tag (dom-by-class dom "recipe-header") 'h1))) (defun org-chef-chef-koch-ingredient-to-string (dom) - (let ((amount (replace-regexp-in-string " " " " (string-trim (dom-texts (car (dom-by-tag dom 'td)))))) + (let ((amount (replace-regexp-in-string "[ \\t\\n\\r]+" " " (string-trim (dom-texts (car (dom-by-tag dom 'td)))))) (name (string-trim (dom-texts (cadr (dom-by-tag dom 'td)))))) (format "%s %s" amount name))) (defun org-chef-chef-koch-extract-ingredients (dom) - "Get the ingredients for a recipe from an chefkoch DOM." - (mapcar #'org-chef-chef-koch-ingredient-to-string (dom-by-tag (dom-by-class dom "^incredients$") 'tr))) + "Get the ingredients for a recipe from a chefkoch DOM." + (mapcar #'org-chef-chef-koch-ingredient-to-string (dom-by-tag (dom-by-class dom "ingredients") 'tr))) (defun org-chef-chef-koch-extract-servings (dom) - "Get the number of servings for a recipe from an chefkoch DOM." + "Get the number of servings for a recipe from a chefkoch DOM." (dom-attr (dom-elements dom 'name "^portionen$") 'value)) (defun org-chef-chef-koch-extract-prep-time (dom) - "Get the amount of prep-time for a recipe from an chefkoch DOM." + "Get the amount of prep-time for a recipe from a chefkoch DOM." (let ((str (replace-regexp-in-string "\n" " " (dom-texts (dom-by-id dom "^preparation-info$"))))) (string-match "Arbeitszeit:[[:space:]]+ca. \\(?1:[^\.]*\\)\." str) (match-string 1 str))) (defun org-chef-chef-koch-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from an chefkoch DOM." + "Get the amount of cook-time for a recipe from a chefkoch DOM." (let ((str (replace-regexp-in-string "\n" " " (dom-texts (dom-by-id dom "^preparation-info$"))))) (string-match "Koch-/Backzeit:[[:space:]]+ca. \\(?1:[^\.]*\\)\." str) (match-string 1 str))) (defun org-chef-chef-koch-extract-ready-in (dom) - "Get the total amount of time for a recipe from an chefkoch DOM." + "Get the total amount of time for a recipe from a chefkoch DOM." "") (defun org-chef-chef-koch-extract-directions (dom) - "Get the directions for a recipe from an chefkoch DOM." + "Get the directions for a recipe from a chefkoch DOM." (with-temp-buffer - (insert (string-trim (dom-texts (dom-by-class dom "^instructions")))) + (insert (string-trim (dom-text (car (dom-by-tag (nth 3 (dom-by-tag dom 'article)) 'div))))) (delete-trailing-whitespace) (split-string (buffer-string) "\n"))) @@ -125,7 +125,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (cons `(source-url . ,url) (org-chef-chef-koch-from-dom dom))))) diff --git a/elpa/org-chef-20181202.2221/org-chef-cultures-for-health.el b/elpa/org-chef-20191017.2015/org-chef-cultures-for-health.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-cultures-for-health.el rename to elpa/org-chef-20191017.2015/org-chef-cultures-for-health.el index d43d703a..a4ea02e4 100644 --- a/elpa/org-chef-20181202.2221/org-chef-cultures-for-health.el +++ b/elpa/org-chef-20191017.2015/org-chef-cultures-for-health.el @@ -89,7 +89,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (cons `(source-url . ,url) (org-chef-cultures-for-health-from-dom dom))))) diff --git a/elpa/org-chef-20191017.2015/org-chef-fine-cooking.el b/elpa/org-chef-20191017.2015/org-chef-fine-cooking.el new file mode 100644 index 00000000..3f1acc63 --- /dev/null +++ b/elpa/org-chef-20191017.2015/org-chef-fine-cooking.el @@ -0,0 +1,81 @@ +;;; org-chef-fine-cooking.el --- Functions for fetching recipes from finecooking.com. -*- lexical-binding: t; -*- + +;; Copyright (C) 2019 Calvin Beck, Erik Hetzner + +;; Author: Erik Hetzner +;; URL: https://github.com/Chobbes/org-chef +;; Created: 2019 + +;; Permission is hereby granted, free of charge, to any person +;; obtaining a copy of this software and associated documentation +;; files (the "Software"), to deal in the Software without +;; restriction, including without limitation the rights to use, copy, +;; modify, merge, publish, distribute, sublicense, and/or sell copies +;; of the Software, and to permit persons to whom the Software is +;; furnished to do so, subject to the following conditions: + +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. + +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +;; SOFTWARE. + +;;; Commentary: + +;; Functions for fetching information from finecooking.com. + +;;; Code: + +(require 'org-chef-utils) +(require 'dom) + +(defun org-chef-fine-cooking-extract-name (dom) + "Get the name of a recipe from an finecooking DOM." + (dom-text (dom-by-class dom "^recipe__title"))) + +(defun org-chef-fine-cooking-extract-ingredients (dom) + "Get the ingredients for a recipe from an finecooking DOM." + (mapcar #'(lambda (n) (string-trim (dom-texts n))) + (org-chef-dom-children (dom-child-by-tag (dom-by-class dom "^recipe__ingredients$") 'ul)))) + +(defun org-chef-fine-cooking-extract-servings (dom) + "Get the number of servings for a recipe from an finecooking DOM." + (dom-text (dom-child-by-tag (dom-by-class dom "^recipe__yield$") 'p))) + +(defun org-chef-fine-cooking-extract-directions (dom) + "Get the directions for a recipe from an finecooking DOM." + (mapcar #'(lambda (n) (string-trim (dom-texts n))) + (org-chef-dom-children (dom-child-by-tag (dom-by-class dom "^recipe__preparation$") 'ul)))) + +(defun org-chef-fine-cooking-fetch (url) + "Given a finecooking.com URL, retrieve the recipe information. + +This returns an alist with the following keys: + +- name +- ingredients +- servings +- prep-time +- cook-time +- ready-in +- directions +- source-url" + (with-current-buffer (org-chef-url-retrieve-synchronously url) + (let ((dom (libxml-parse-html-region (point-min) (point-max)))) + `((name . ,(org-chef-fine-cooking-extract-name dom)) + (ingredients . ,(org-chef-fine-cooking-extract-ingredients dom)) + (servings . ,(org-chef-fine-cooking-extract-servings dom)) + (prep-time . nil) + (cook-time . nil) + (ready-in . nil) + (directions . ,(org-chef-fine-cooking-extract-directions dom)) + (source-url . ,url))))) + +(provide 'org-chef-fine-cooking) +;;; org-chef-fine-cooking.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef-genius-kitchen.el b/elpa/org-chef-20191017.2015/org-chef-genius-kitchen.el similarity index 85% rename from elpa/org-chef-20181202.2221/org-chef-genius-kitchen.el rename to elpa/org-chef-20191017.2015/org-chef-genius-kitchen.el index 2c2de7a1..0f5fa013 100644 --- a/elpa/org-chef-20181202.2221/org-chef-genius-kitchen.el +++ b/elpa/org-chef-20191017.2015/org-chef-genius-kitchen.el @@ -41,29 +41,27 @@ (defun org-chef-genius-kitchen-extract-name (dom) "Get the name of a recipe from an geniuskitchen DOM." - (dom-text (caddr - (seq-filter (lambda (x) (not (stringp x))) - (dom-children (car (dom-by-class dom "^recipe-header"))))))) + (dom-texts (dom-by-class dom "^recipe-title$"))) (defun org-chef-genius-kitchen-extract-ingredients (dom) "Get the ingredients for a recipe from an geniuskitchen DOM." - (mapcar #'dom-texts (dom-elements dom 'data-ingredient ".*"))) + (mapcar #'dom-texts (dom-by-class dom "^recipe-ingredients__ingredient$"))) (defun org-chef-genius-kitchen-extract-servings (dom) "Get the number of servings for a recipe from an geniuskitchen DOM." - (dom-text (car (dom-by-class (car (dom-by-class dom "^servings$")) "count")))) + (dom-texts (dom-by-class (car (dom-by-class dom "recipe-facts__yield")) "theme-color"))) (defun org-chef-genius-kitchen-extract-ready-in (dom) "Get the total amount of time for a recipe from an geniuskitchen DOM." - (string-trim (dom-text (car (dom-by-class dom "time"))))) + (dom-texts (cddddr (car (dom-by-class dom "recipe-facts__time"))))) (defun org-chef-genius-kitchen-extract-directions (dom) "Get the directions for a recipe from an geniuskitchen DOM." - (let ((directions-list (dom-by-tag (car (dom-by-class dom "directions-inner")) 'li))) + (let ((directions-list (dom-by-tag (car (dom-by-class dom "recipe-directions__step")) 'li))) (org-chef-remove-empty-strings (mapcar #'(lambda (n) (string-trim (dom-text n))) directions-list)))) @@ -81,7 +79,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) `((name . ,(org-chef-genius-kitchen-extract-name dom)) (ingredients . ,(org-chef-genius-kitchen-extract-ingredients dom)) diff --git a/elpa/org-chef-20181202.2221/org-chef-marmiton.el b/elpa/org-chef-20191017.2015/org-chef-marmiton.el similarity index 87% rename from elpa/org-chef-20181202.2221/org-chef-marmiton.el rename to elpa/org-chef-20191017.2015/org-chef-marmiton.el index 57dd7e22..4b891425 100644 --- a/elpa/org-chef-20181202.2221/org-chef-marmiton.el +++ b/elpa/org-chef-20191017.2015/org-chef-marmiton.el @@ -39,13 +39,13 @@ (require 'dom) -(defun sanitize (str) +(defun org-chef-marmiton-sanitize (str) "Sanitize the STR by removing beginning/trailing spaces extracted from a marmiton dom." (replace-regexp-in-string "^[ \r\n]*\\(.*[^ \r\n]\\)[ \r\n]*$" "\\1" str)) -(defun extract-dom-text (dom) +(defun org-chef-marmiton-extract-dom-text (dom) "Embedded the operation santize of dom-text from a marmiton DOM." - (sanitize (dom-text dom))) + (org-chef-marmiton-sanitize (dom-texts dom))) (defun org-chef-marmiton-extract-name (dom) "Get the name of a recipe from a marmiton DOM." @@ -54,9 +54,9 @@ (defun org-chef-marmiton-extract-current-ingredient (dom) "Extract element for the current ingredient from a marmiton DOM." (concat - (extract-dom-text (dom-elements dom 'class "^recipe-ingredient-qt$")) + (org-chef-marmiton-extract-dom-text (dom-elements dom 'class "^recipe-ingredient-qt$")) " " - (extract-dom-text (dom-elements dom 'class "^ingredient$")))) + (org-chef-marmiton-extract-dom-text (dom-elements dom 'class "^ingredient$")))) (defun org-chef-marmiton-extract-ingredients (dom) "Get the ingredients for a recipe from a marmiton DOM." @@ -65,17 +65,18 @@ (defun org-chef-marmiton-extract-directions (dom) "Get the directions for a recipe from a marmiton DOM." - (mapcar 'extract-dom-text (dom-elements dom 'class "^recipe-preparation__list__item$"))) + (mapcar (lambda (x) (org-chef-marmiton-extract-dom-text (cddr x))) + (dom-elements dom 'class "^recipe-preparation__list__item$"))) (defun org-chef-marmiton-extract-prep-time (dom) "Get the preparation time for a recipe from a marmiton DOM." - (extract-dom-text + (org-chef-marmiton-extract-dom-text (dom-elements (dom-elements dom 'class "recipe-infos__timmings__preparation") 'class "^recipe-infos__timmings__value$"))) (defun org-chef-marmiton-extract-cook-time (dom) "Extract the cooking time for a recipe from a marmiton DOM." - (extract-dom-text + (org-chef-marmiton-extract-dom-text (dom-elements (dom-elements dom 'class "recipe-infos__timmings__cooking") 'class "^recipe-infos__timmings__value$"))) @@ -119,7 +120,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (cons `(source-url . ,url) (org-chef-marmiton-from-dom dom))))) diff --git a/elpa/org-chef-20181202.2221/org-chef-martha-stewart.el b/elpa/org-chef-20191017.2015/org-chef-martha-stewart.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-martha-stewart.el rename to elpa/org-chef-20191017.2015/org-chef-martha-stewart.el index a2ee19c8..e867c9a9 100644 --- a/elpa/org-chef-20181202.2221/org-chef-martha-stewart.el +++ b/elpa/org-chef-20191017.2015/org-chef-martha-stewart.el @@ -89,7 +89,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) `((name . ,(org-chef-martha-stewart-extract-name dom)) diff --git a/elpa/org-chef-20181202.2221/org-chef-nytimes.el b/elpa/org-chef-20191017.2015/org-chef-nytimes.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-nytimes.el rename to elpa/org-chef-20191017.2015/org-chef-nytimes.el index 3712c585..b52f18c9 100644 --- a/elpa/org-chef-20181202.2221/org-chef-nytimes.el +++ b/elpa/org-chef-20191017.2015/org-chef-nytimes.el @@ -119,7 +119,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (cons `(source-url . ,url) (org-chef-nytimes-from-dom dom))))) diff --git a/elpa/org-chef-20181202.2221/org-chef-pkg.el b/elpa/org-chef-20191017.2015/org-chef-pkg.el similarity index 84% rename from elpa/org-chef-20181202.2221/org-chef-pkg.el rename to elpa/org-chef-20191017.2015/org-chef-pkg.el index 70f03844..3eeb1f2c 100644 --- a/elpa/org-chef-20181202.2221/org-chef-pkg.el +++ b/elpa/org-chef-20191017.2015/org-chef-pkg.el @@ -1,4 +1,4 @@ -(define-package "org-chef" "20181202.2221" "Cookbook and recipe management with org-mode." +(define-package "org-chef" "20191017.2015" "Cookbook and recipe management with org-mode." '((org "0") (emacs "24")) :keywords diff --git a/elpa/org-chef-20181202.2221/org-chef-reluctant-gourmet.el b/elpa/org-chef-20191017.2015/org-chef-reluctant-gourmet.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-reluctant-gourmet.el rename to elpa/org-chef-20191017.2015/org-chef-reluctant-gourmet.el index 47e75e9d..519bfd03 100644 --- a/elpa/org-chef-20181202.2221/org-chef-reluctant-gourmet.el +++ b/elpa/org-chef-20191017.2015/org-chef-reluctant-gourmet.el @@ -113,7 +113,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (cons `(source-url . ,url) (org-chef-reluctant-gourmet-from-dom dom))))) diff --git a/elpa/org-chef-20181202.2221/org-chef-saveur.el b/elpa/org-chef-20191017.2015/org-chef-saveur.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-saveur.el rename to elpa/org-chef-20191017.2015/org-chef-saveur.el index e5dfc0e4..220da3d0 100644 --- a/elpa/org-chef-20181202.2221/org-chef-saveur.el +++ b/elpa/org-chef-20191017.2015/org-chef-saveur.el @@ -130,7 +130,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (cons `(source-url . ,url) (org-chef-saveur-from-dom dom))))) diff --git a/elpa/org-chef-20181202.2221/org-chef-serious-eats.el b/elpa/org-chef-20191017.2015/org-chef-serious-eats.el similarity index 95% rename from elpa/org-chef-20181202.2221/org-chef-serious-eats.el rename to elpa/org-chef-20191017.2015/org-chef-serious-eats.el index 0ed4300c..e55160b7 100644 --- a/elpa/org-chef-20181202.2221/org-chef-serious-eats.el +++ b/elpa/org-chef-20191017.2015/org-chef-serious-eats.el @@ -41,12 +41,12 @@ (defun org-chef-serious-eats-extract-name (dom) "Get the name of a recipe from an seriouseats DOM." - (dom-text (car (dom-elements dom 'itemprop "^name$")))) + (dom-text (car (dom-elements dom 'class "recipe-title")))) (defun org-chef-serious-eats-extract-ingredients (dom) "Get the ingredients for a recipe from an seriouseats DOM." - (mapcar 'dom-texts (dom-elements dom 'itemprop "^recipeIngredient$"))) + (mapcar 'dom-texts (dom-elements dom 'class "^ingredient$"))) (defun org-chef-serious-eats-extract-servings (dom) @@ -96,7 +96,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) `((name . ,(org-chef-serious-eats-extract-name dom)) @@ -108,6 +108,5 @@ This returns an alist with the following keys: (directions . ,(org-chef-serious-eats-extract-directions dom)) (source-url . ,url))))) - (provide 'org-chef-serious-eats) ;;; org-chef-serious-eats.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef-simply-recipes.el b/elpa/org-chef-20191017.2015/org-chef-simply-recipes.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-simply-recipes.el rename to elpa/org-chef-20191017.2015/org-chef-simply-recipes.el index 831e766a..049d18f4 100644 --- a/elpa/org-chef-20181202.2221/org-chef-simply-recipes.el +++ b/elpa/org-chef-20191017.2015/org-chef-simply-recipes.el @@ -112,7 +112,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (cons `(source-url . ,url) (org-chef-simply-recipes-from-dom dom))))) diff --git a/elpa/org-chef-20181202.2221/org-chef-steamy-kitchen.el b/elpa/org-chef-20191017.2015/org-chef-steamy-kitchen.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-steamy-kitchen.el rename to elpa/org-chef-20191017.2015/org-chef-steamy-kitchen.el index 6591c0b4..514fb7e7 100644 --- a/elpa/org-chef-20181202.2221/org-chef-steamy-kitchen.el +++ b/elpa/org-chef-20191017.2015/org-chef-steamy-kitchen.el @@ -88,7 +88,7 @@ This returns an alist with the following keys: - ready-in - directions - source-url" - (with-current-buffer (url-retrieve-synchronously url) + (with-current-buffer (org-chef-url-retrieve-synchronously url) (let ((dom (libxml-parse-html-region (point-min) (point-max)))) `((name . ,(org-chef-steamy-kitchen-extract-name dom)) diff --git a/elpa/org-chef-20191017.2015/org-chef-taste.el b/elpa/org-chef-20191017.2015/org-chef-taste.el new file mode 100644 index 00000000..623e3a23 --- /dev/null +++ b/elpa/org-chef-20191017.2015/org-chef-taste.el @@ -0,0 +1,103 @@ +;;; org-chef-taste.el --- org-chef taste.com.au fetching -*- lexical-binding: t; -*- + +;; Copyright (C) 2019 Calvin Beck, Peter Hardy + +;; Author: Peter Hardy +;; URL: https://github.com/Chobbes/org-chef +;; Created: 2019 + +;; Copyright 2019 Peter Hardy + +;; Permission is hereby granted, free of charge, to any person +;; obtaining a copy of this software and associated documentation +;; files (the "Software"), to deal in the Software without +;; restriction, including without limitation the rights to use, copy, +;; modify, merge, publish, distribute, sublicense, and/or sell copies +;; of the Software, and to permit persons to whom the Software is +;; furnished to do so, subject to the following conditions: + +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. + +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +;; SOFTWARE. + +;;; Commentary: + +;; Functions for fetching information from taste.com.au. + +;;; Code: + +(require 'org-chef-utils) +(require 'cl-seq) +(require 'dom) + +(defun org-chef-taste-extract-cooking-infos (dom info) + "Get INFO from recipe-cooking-infos in a taste.com.au DOM." + (let ((i (cl-position info (mapcar #'(lambda (n) (string-trim (dom-text n))) (dom-by-tag (dom-by-class dom "^recipe-cooking-infos$") 'li)) :test 'equal))) + (if i + (dom-text (nth i (dom-by-tag (dom-by-class dom "^recipe-cooking-infos$") 'b))) + ""))) + +(defun org-chef-taste-extract-name (dom) + "Get the name of a recipe from a taste.com.au DOM." + (dom-text (dom-by-tag dom 'h1))) + +(defun org-chef-taste-extract-ingredients (dom) + "Get the ingredients for a recipe from a taste.com.au DOM." + (mapcar #'(lambda (n) (string-trim (dom-texts n))) + (dom-by-class dom "^ingredient-description$"))) + +(defun org-chef-taste-extract-servings (dom) + "Get the servings for a recipe from a taste.com.au DOM." + (let ((servings (org-chef-taste-extract-cooking-infos dom "Servings"))) + (if (string-equal servings "") + (org-chef-taste-extract-cooking-infos dom "Makes") + servings))) + +(defun org-chef-taste-extract-prep-time (dom) + "Get the prep time for a recipe from a taste.com.au DOM." + (org-chef-taste-extract-cooking-infos dom "Prep")) + +(defun org-chef-taste-extract-cook-time (dom) + "Get the prep time for a recipe from a taste.com.au DOM." + (org-chef-taste-extract-cooking-infos dom "Cook")) + +(defun org-chef-taste-extract-directions (dom) + "Get the directions for a recipe from a taste.com.au DOM." + (mapcar #'(lambda (n) (string-trim (dom-texts n))) + (dom-by-class dom "^recipe-method-step-content$"))) + +(defun org-chef-taste-fetch (url) + "Given a taste.com.au URL, retrieve the recipe information. + +This returns an alist with the following keys: + +- name +- ingredients +- servings +- prep-time +- cook-time +- ready-in +- directions +- source-url" + (with-current-buffer (org-chef-url-retrieve-synchronously url) + (let ((dom (libxml-parse-html-region (point-min) (point-max)))) + + `((name . ,(org-chef-taste-extract-name dom)) + (ingredients . ,(org-chef-taste-extract-ingredients dom)) + (servings . ,(org-chef-taste-extract-servings dom)) + (prep-time . ,(org-chef-taste-extract-prep-time dom)) + (cook-time . ,(org-chef-taste-extract-cook-time dom)) + (ready-in . "") + (directions . ,(org-chef-taste-extract-directions dom)) + (source-url . ,url))))) + +(provide 'org-chef-taste) +;;; org-chef-taste.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef-utils.el b/elpa/org-chef-20191017.2015/org-chef-utils.el similarity index 85% rename from elpa/org-chef-20181202.2221/org-chef-utils.el rename to elpa/org-chef-20191017.2015/org-chef-utils.el index a9aadb24..02e95cb3 100644 --- a/elpa/org-chef-20181202.2221/org-chef-utils.el +++ b/elpa/org-chef-20191017.2015/org-chef-utils.el @@ -61,5 +61,18 @@ should be used." lst)) +(defun org-chef-url-retrieve-synchronously (url) + "Fetch URL using url-retrieve-synchronously. + +This is a wrapper for url-retrieve-synchronously, which primarily serves to implement workarounds." + + (let ((gnutls-algorithm-priority + (if org-chef-fetch-workaround + "NORMAL:-VERS-TLS1.3" + gnutls-algorithm-priority))) + + (url-retrieve-synchronously url))) + + (provide 'org-chef-utils) ;;; org-chef-utils.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef-wordpress.el b/elpa/org-chef-20191017.2015/org-chef-wordpress.el similarity index 98% rename from elpa/org-chef-20181202.2221/org-chef-wordpress.el rename to elpa/org-chef-20191017.2015/org-chef-wordpress.el index fe831575..5c63619e 100644 --- a/elpa/org-chef-20181202.2221/org-chef-wordpress.el +++ b/elpa/org-chef-20191017.2015/org-chef-wordpress.el @@ -94,9 +94,9 @@ This returns an alist with the following keys: - source-url If this is not a wordpress site, then return nil." - (with-current-buffer (url-retrieve-synchronously url) - (let ((dom (libxml-parse-html-region (point-min) (point-max)))) + (with-current-buffer (org-chef-url-retrieve-synchronously url) + (let ((dom (libxml-parse-html-region (point-min) (point-max)))) (if (org-chef-is-wordpress-p dom) `((name . ,(org-chef-wordpress-extract-name dom)) (ingredients . ,(org-chef-wordpress-extract-ingredients dom)) diff --git a/elpa/org-chef-20191017.2015/org-chef-xiachufang.el b/elpa/org-chef-20191017.2015/org-chef-xiachufang.el new file mode 100644 index 00000000..2d605290 --- /dev/null +++ b/elpa/org-chef-20191017.2015/org-chef-xiachufang.el @@ -0,0 +1,118 @@ +;;; org-chef-xiachufang.el --- Functions for fetching recipes from xiachufang.com. -*- lexical-binding: t; -*- + +;; Copyright (C) 2018 Calvin Beck/Sébastien Le Maguer + +;; Author: Calvin Beck /Sébastien Le Maguer +;; URL: https://github.com/Chobbes/org-chef +;; Created: 2018 + +;; Copyright 2019 Yiu Fung Cheong + +;; Permission is hereby granted, free of charge, to any person +;; obtaining a copy of this software and associated documentation +;; files (the "Software"), to deal in the Software without +;; restriction, including without limitation the rights to use, copy, +;; modify, merge, publish, distribute, sublicense, and/or sell copies +;; of the Software, and to permit persons to whom the Software is +;; furnished to do so, subject to the following conditions: + +;; The above copyright notice and this permission notice shall be +;; included in all copies or substantial portions of the Software. + +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +;; SOFTWARE. + +;;; Commentary: + +;; Functions for fetching information from xiachufang.com. + +;;; Code: + + +(require 'org-chef-utils) +(require 'dom) + +(defun org-chef-xiachufang-sanitize (str) + "Sanitize the STR by removing beginning/trailing spaces extracted from a marmiton dom." + (replace-regexp-in-string "^[ \r\n]*\\(.*[^ \r\n]\\)[ \r\n]*$" "\\1" str)) + +(defun org-chef-xiachufang-extract-name (dom) + "Get the name of a recipe from a xiachufang DOM." + (org-chef-xiachufang-sanitize (dom-text (car (dom-elements dom 'class "^page-title$"))))) + + +(defun org-chef-xiachufang-extract-ingredients (dom) + "Get the ingredients for a recipe from a xiachufang DOM." + (mapcar #'(lambda (n) + (replace-regexp-in-string "\n" " " (org-chef-xiachufang-sanitize (dom-texts n)))) + (dom-elements dom 'itemprop "^recipeIngredient$"))) + + +(defun org-chef-xiachufang-extract-directions (dom) + "Get the directions for a recipe from a xiachufang DOM." + (mapcar #'(lambda (n) + (replace-regexp-in-string "\n" " " (org-chef-xiachufang-sanitize (dom-texts n)))) + (dom-elements dom 'itemprop "^recipeInstructions$"))) + + +(defun org-chef-xiachufang-extract-prep-time (dom) + "Get the preparation time for a recipe from a xiachufang DOM." + "") + + +(defun org-chef-xiachufang-extract-cook-time (dom) + "Extract the cooking time for a recipe from a xiachufang DOM." + "") + + +(defun org-chef-xiachufang-extract-servings (dom) + "") + + +(defun org-chef-xiachufang-from-dom (dom) + "Given a xiachufang.com DOM, retrieve the recipe information. + +This returns an alist with the following keys: + +- name +- ingredients +- servings +- prep-time +- cook-time +- ready-in +- directions" + `((ingredients . ,(org-chef-xiachufang-extract-ingredients dom)) + (name . ,(org-chef-xiachufang-extract-name dom)) + (servings . ,(org-chef-xiachufang-extract-servings dom)) + (prep-time . ,(org-chef-xiachufang-extract-prep-time dom)) + (cook-time . ,(org-chef-xiachufang-extract-cook-time dom)) + (ready-in . nil) + (directions . ,(org-chef-xiachufang-extract-directions dom)))) + + +(defun org-chef-xiachufang-fetch (url) + "Given a xiachufang.com URL, retrieve the recipe information. + +This returns an alist with the following keys: + +- name +- ingredients +- servings +- prep-time +- cook-time +- ready-in +- directions +- source-url" + (with-current-buffer (org-chef-url-retrieve-synchronously url) + (let ((dom (libxml-parse-html-region (point-min) (point-max)))) + (cons `(source-url . ,url) (org-chef-xiachufang-from-dom dom))))) + + +(provide 'org-chef-xiachufang) +;;; org-chef-xiachufang.el ends here diff --git a/elpa/org-chef-20181202.2221/org-chef.el b/elpa/org-chef-20191017.2015/org-chef.el similarity index 86% rename from elpa/org-chef-20181202.2221/org-chef.el rename to elpa/org-chef-20191017.2015/org-chef.el index 90c4acee..63eea67d 100644 --- a/elpa/org-chef-20181202.2221/org-chef.el +++ b/elpa/org-chef-20191017.2015/org-chef.el @@ -41,11 +41,11 @@ (require 'org-chef-utils) +(require 'org-chef-24kitchen) (require 'org-chef-all-recipes) (require 'org-chef-genius-kitchen) (require 'org-chef-simply-recipes) (require 'org-chef-martha-stewart) -(require 'org-chef-budget-bytes) (require 'org-chef-cultures-for-health) (require 'org-chef-marmiton) (require 'org-chef-serious-eats) @@ -54,9 +54,22 @@ (require 'org-chef-steamy-kitchen) (require 'org-chef-nytimes) (require 'org-chef-saveur) +(require 'org-chef-xiachufang) (require 'org-chef-wordpress) +(require 'org-chef-taste) +(defvar org-chef-fetch-workaround + (and + ;; Note: For build sans gnutls, `libgnutls-version' is -1. + (>= libgnutls-version 30603) + (version<= emacs-version "26.2") + 't) + "Inspired by https://github.com/magit/ghub/blob/7d59937d7782d0062216130a4d059b45e8396f82/ghub.el#L452 + +See https://github.com/magit/ghub/issues/81 and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341 +for more information.") + (defun org-chef-recipe-insert-org (recipe) "Insert a RECIPE as an ‘org-mode’ heading." (org-insert-heading) @@ -96,11 +109,11 @@ (defun org-chef-fetch-recipe-specific-url (URL) "Look up a recipe based on a specific URL." (cond + ((org-chef-match-url "24kitchen.nl" URL) (org-chef-24kitchen-fetch URL)) ((org-chef-match-url "allrecipes.com" URL) (org-chef-all-recipes-fetch URL)) ((org-chef-match-url "geniuskitchen.com" URL) (org-chef-genius-kitchen-fetch URL)) ((org-chef-match-url "simplyrecipes.com" URL) (org-chef-simply-recipes-fetch URL)) ((org-chef-match-url "marthastewart.com" URL) (org-chef-martha-stewart-fetch URL)) - ((org-chef-match-url "budgetbytes.com" URL) (org-chef-budget-bytes-fetch URL)) ((org-chef-match-url "culturesforhealth.com" URL) (org-chef-cultures-for-health-fetch URL)) ((org-chef-match-url "marmiton.org" URL) (org-chef-marmiton-fetch URL)) ((org-chef-match-url "seriouseats.com" URL) (org-chef-serious-eats-fetch URL)) @@ -109,6 +122,9 @@ ((org-chef-match-url "steamykitchen.com" URL) (org-chef-steamy-kitchen-fetch URL)) ((org-chef-match-url "nytimes.com" URL) (org-chef-nytimes-fetch URL)) ((org-chef-match-url "saveur.com" URL) (org-chef-saveur-fetch URL)) + ((org-chef-match-url "xiachufang.com" URL) (org-chef-xiachufang-fetch URL)) + ((org-chef-match-url "finecooking.com" URL) (org-chef-fine-cooking-fetch URL)) + ((org-chef-match-url "taste.com.au" URL) (org-chef-taste-fetch URL)) (t nil))) @@ -120,6 +136,7 @@ (org-chef-wordpress-fetch URL)))) +;;;###autoload (defun org-chef-insert-recipe (URL) "Prompt for a recipe URL, and then insert the recipe at point." (interactive "sRecipe URL: ") diff --git a/elpa/org-mime-20181023.2314/org-mime-pkg.el b/elpa/org-mime-20181023.2314/org-mime-pkg.el deleted file mode 100644 index c0edfdee..00000000 --- a/elpa/org-mime-20181023.2314/org-mime-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "org-mime" "20181023.2314" "org html export for text/html MIME emails" '((emacs "24.4") (cl-lib "0.5")) :commit "1e792ef0616069b3ec74a4b7d96fced8c9c6eb8a" :keywords '("mime" "mail" "email" "html") :authors '(("Eric Schulte")) :maintainer '("Chen Bin (redguardtoo)") :url "http://github.com/org-mime/org-mime") diff --git a/elpa/org-mime-20181023.2314/org-mime-autoloads.el b/elpa/org-mime-20190805.57/org-mime-autoloads.el similarity index 58% rename from elpa/org-mime-20181023.2314/org-mime-autoloads.el rename to elpa/org-mime-20190805.57/org-mime-autoloads.el index cd9eb9de..3fe08d3f 100644 --- a/elpa/org-mime-20181023.2314/org-mime-autoloads.el +++ b/elpa/org-mime-20190805.57/org-mime-autoloads.el @@ -1,12 +1,10 @@ ;;; org-mime-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "org-mime" "org-mime.el" (0 0 0 0)) +;;;### (autoloads nil "org-mime" "org-mime.el" (23994 46438 579200 +;;;;;; 771000)) ;;; Generated autoloads from org-mime.el (autoload 'org-mime-htmlize "org-mime" "\ @@ -25,30 +23,27 @@ The following file keywords can be used to control the headers: #+MAIL_SUBJECT: a subject line #+MAIL_CC: some2@some.place #+MAIL_BCC: some3@some.place +#+MAIL_FROM: sender@some.place The cursor ends in the TO field. \(fn)" t nil) (autoload 'org-mime-org-subtree-htmlize "org-mime" "\ -Create an email buffer of the current subtree. -The buffer will contain both html and in org formats as mime -alternatives. +Create an email buffer of the current subtree. If HTMLIZE-FIRST-LEVEL is +not nil, the first level subtree which containing current subtree is htmlized. -The following headline properties can determine the headers. +Following headline properties can determine the mail headers, * subtree heading - :PROPERTIES: - :MAIL_SUBJECT: mail title - :MAIL_TO: person1@gmail.com - :MAIL_CC: person2@gmail.com - :MAIL_BCC: person3@gmail.com - :END: - -The cursor is left in the TO field. - -\(fn)" t nil) + :PROPERTIES: + :MAIL_SUBJECT: mail title + :MAIL_TO: person1@gmail.com + :MAIL_CC: person2@gmail.com + :MAIL_BCC: person3@gmail.com + :MAIL_FROM: sender@gmail.com + :END: -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mime" '("org-mime-"))) +\(fn &optional HTMLIZE-FIRST-LEVEL)" t nil) ;;;*** @@ -56,6 +51,5 @@ The cursor is left in the TO field. ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; org-mime-autoloads.el ends here diff --git a/elpa/org-mime-20190805.57/org-mime-pkg.el b/elpa/org-mime-20190805.57/org-mime-pkg.el new file mode 100644 index 00000000..fcfe0eb3 --- /dev/null +++ b/elpa/org-mime-20190805.57/org-mime-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "org-mime" "20190805.57" "org html export for text/html MIME emails" '((emacs "24.4") (cl-lib "0.5")) :commit "4bd5d55ba9bca84ffd938b477c72d701cf3736df" :keywords '("mime" "mail" "email" "html") :authors '(("Eric Schulte")) :maintainer '("Chen Bin (redguardtoo)") :url "http://github.com/org-mime/org-mime") diff --git a/elpa/org-mime-20181023.2314/org-mime.el b/elpa/org-mime-20190805.57/org-mime.el similarity index 81% rename from elpa/org-mime-20181023.2314/org-mime.el rename to elpa/org-mime-20190805.57/org-mime.el index b913dcb3..68a3af63 100644 --- a/elpa/org-mime-20181023.2314/org-mime.el +++ b/elpa/org-mime-20190805.57/org-mime.el @@ -5,9 +5,9 @@ ;; Author: Eric Schulte ;; Maintainer: Chen Bin (redguardtoo) ;; Keywords: mime, mail, email, html -;; Package-Version: 20181023.2314 +;; Package-Version: 20190805.57 ;; Homepage: http://github.com/org-mime/org-mime -;; Version: 0.1.1 +;; Version: 0.1.6 ;; Package-Requires: ((emacs "24.4") (cl-lib "0.5")) ;; This file is not part of GNU Emacs. @@ -43,17 +43,15 @@ ;; encoding. ;; ;; `org-mime-org-subtree-htmlize' is similar to `org-mime-org-buffer-htmlize' -;; but works on a subtree. It can also read the following subtree properties: -;; MAIL_SUBJECT, MAIL_TO, MAIL_CC, and MAIL_BCC. Note the behavior of this is -;; controlled by `org-mime-up-subtree-heading'. The default is to go up to the -;; heading containing the current subtree. - -;; Here is the sample of a subtree: +;; but works on current subtree. It can read following subtree properties: +;; MAIL_SUBJECT, MAIL_TO, MAIL_FROM, MAIL_CC, and MAIL_BCC. ;; +;; Here is the sample of a subtree: ;; * mail one ;; :PROPERTIES: ;; :MAIL_SUBJECT: mail title ;; :MAIL_TO: person1@gmail.com +;; :MAIL_FROM: sender@gmail.com ;; :MAIL_CC: person2@gmail.com ;; :MAIL_BCC: person3@gmail.com ;; :END: @@ -105,6 +103,7 @@ ;;; Code: (require 'cl-lib) +(require 'outline) (require 'org) (require 'ox-org) @@ -151,7 +150,7 @@ And ensure first line isn't assumed to be a title line." :group 'org-mime :type 'sexp) -(defvar org-mime-export-options nil +(defvar org-mime-export-options '(:with-latex dvipng) "Default export options which may overrides org buffer/subtree options. You avoid exporting section-number/author/toc with the setup below, `(setq org-mime-export-options '(:section-numbers nil :with-author nil :with-toc nil))'") @@ -163,7 +162,7 @@ This could be used for example to post-process html elements.") (defvar org-mime-pre-html-hook nil "Hook to run before html export. Functions should take no arguments and will be run in a -buffer holdin the text to be exported.") +buffer holding the text to be exported.") (defvar org-mime-send-buffer-hook nil "Hook to run in the Org-mode file before export.") @@ -171,11 +170,6 @@ buffer holdin the text to be exported.") (defvar org-mime-debug nil "Enable debug logger.") -(defvar org-mime-up-subtree-heading 'org-up-heading-safe - "Function to call before exporting a subtree. -You could use either `org-up-heading-safe' or `org-back-to-heading'.") - - (defun org-mime-get-export-options (subtreep) "SUBTREEP is t if current node is subtree." (cond @@ -188,31 +182,33 @@ You could use either `org-up-heading-safe' or `org-back-to-heading'.") (if (fboundp 'org-export--get-inbuffer-options) (org-export--get-inbuffer-options)))))) -(defun org-mime-get-exported-content (fmt subtreep) +(defun org-mime-current-line () + "Get current line" + (buffer-substring-no-properties (line-beginning-position) + (line-end-position))) + +(defun org-mime-export-buffer-or-subtree (subtreep) "Similar to `org-html-export-as-html' and `org-org-export-as-org'. -FMT is either 'org or 'html. SUBTREEP is t if current node is subtree." - (let* ((buf (org-export-to-buffer fmt "*Org Mime Export*" + (let* ((plain (buffer-string)) + (buf (org-export-to-buffer 'html "*Org Mime Export*" nil subtreep nil (org-mime-get-export-options subtreep))) (body (prog1 (with-current-buffer buf - (format "#+BEGIN_EXPORT %s\n%s\n#+END_EXPORT" - (symbol-name fmt) - (buffer-string))) + (buffer-string)) (kill-buffer buf)))) - body)) + (cons body plain))) -(defun org-mime--export-string (s fmt &optional opts) - "Export string S using FMT as the backend. +(defun org-mime-export-string (string &optional opts) + "Export STRING into html. OPTS is export options." ;; Emacs 25+ prefer exporting drawer by default ;; obviously not acceptable in exporting to mail body (let* ((org-export-with-drawers nil)) - (when org-mime-debug (message "org-mime--export-string called => %s" opts)) ;; we won't export title from org file anyway (if opts (setq opts (plist-put opts 'title nil))) ;; emacs24.4+ - (org-export-string-as s fmt t (or org-mime-export-options opts)))) + (org-export-string-as string 'html t (or org-mime-export-options opts)))) ;; example hook, for setting a dark background in ;; 
 elements
@@ -284,10 +280,10 @@ HTML is the body of the message."
       (buffer-substring (point-min) (point-max)))))
 
 (defun org-mime-multipart (plain html &optional images)
-  "Markup a multipart/alternative PLAIN with PLAIN and HTML alternatives.
+  "Markup a multipart/alternative with HTML alternatives.
 If html portion of message includes IMAGES they are wrapped in multipart/related part."
   (cl-case org-mime-library
-    (mml (concat "<#multipart type=alternative><#part type=text/plain>"
+    (mml (concat "<#multipart type=alternative>\n<#part type=text/plain>"
                  plain
                  (when images "<#multipart type=related>")
                  "<#part type=text/html>"
@@ -363,7 +359,8 @@ CURRENT-FILE is used to calculate full path of images."
     (message "Warning: org-element-map is not available. File links will not be attached.")
     nil)))
 
-(defun org-mime-insert-html-content (body file s opts)
+(defun org-mime-insert-html-content (plain file html opts)
+  "Insert HTML content."
   (let* ((files (org-mime-extract-non-image-files))
          ;; dvipng for inline latex because MathJax doesn't work in mail
          ;; Also @see https://github.com/org-mime/org-mime/issues/16
@@ -372,15 +369,13 @@ CURRENT-FILE is used to calculate full path of images."
          ;; we don't want to convert org file links to html
          (org-html-link-org-files-as-html nil)
          (org-link-file-path-type 'absolute)
-         ;; makes the replies with ">"s look nicer
+         ;; prettify reply with ">"
          (org-export-preserve-breaks org-mime-preserve-breaks)
-         (plain (org-mime--export-string body 'org))
          ;; org 9
          (org-html-htmlize-output-type 'inline-css)
          ;; org 8
          (org-export-htmlize-output-type 'inline-css)
-         (html-and-images (org-mime-replace-images (org-mime--export-string s 'html opts)
-                                                   file))
+         (html-and-images (org-mime-replace-images html file))
          (images (cdr html-and-images))
          (html (org-mime-apply-html-hook (car html-and-images))))
 
@@ -397,7 +392,7 @@ CURRENT-FILE is used to calculate full path of images."
 
     (insert (org-mime-multipart plain
                                 html
-                                (mapconcat 'identity images "\n")))
+                                (if images (mapconcat 'identity images "\n"))))
 
     ;; Attach any residual files
     (when files
@@ -422,22 +417,19 @@ If called with an active region only export that region, otherwise entire body."
          (html-end (or (and region-p (region-end))
                        ;; TODO: should catch signature...
                        (point-max)))
-         (body (buffer-substring
-                html-start html-end))
-         (str (concat org-mime-default-header body))
-         (file (make-temp-name (expand-file-name
-                                "mail" temporary-file-directory)))
-
-
-         ;; to hold attachments for inline html images
+         (plain (buffer-substring html-start html-end))
+;; to hold attachments for inline html images
          (opts (if (fboundp 'org-export--get-inbuffer-options)
-                   (org-export--get-inbuffer-options))))
+                   (org-export--get-inbuffer-options)))
+         (html (org-mime-export-string (concat org-mime-default-header plain) opts))
+         (file (make-temp-name (expand-file-name
+                                "mail" temporary-file-directory))))
 
     ;; delete current region
     (delete-region html-start html-end)
     (goto-char html-start)
     ;; insert new current
-    (org-mime-insert-html-content body file str opts)))
+    (org-mime-insert-html-content plain file html opts)))
 
 (defun org-mime-apply-html-hook (html)
   "Apply HTML hook."
@@ -458,28 +450,27 @@ If called with an active region only export that region, otherwise entire body."
         (set-text-properties 0 (length txt) nil txt)
         txt))))
 
-(defun org-mime-compose (body file to subject headers subtreep)
-  "Create mail BODY in FILE with TO, SUBJECT, HEADERS.
+(defun org-mime-compose (exported file to subject headers subtreep)
+  "Create mail body from EXPORTED in FILE with TO, SUBJECT, HEADERS.
 If SUBTREEP is t, curret org node is subtree."
   ;; start composing mail
-  (unless (featurep 'message)
-    (require 'message))
-  (message-mail to subject headers nil)
-  (message-goto-body)
-
-  ;; insert text
-  (let* ((str (with-temp-buffer
-                (insert body)
-                (goto-char (point-min))
-                (run-hooks 'org-mime-pre-html-hook)
-                (buffer-string))))
-    (org-mime-insert-html-content body
-                                  file
-                                  str
-                                  (org-mime-get-export-options subtreep))))
+  (let* ((html (car exported))
+         (plain (cdr exported))
+         (export-opts (org-mime-get-export-options subtreep))
+         patched-html)
+    (unless (featurep 'message) (require 'message))
+    (message-mail to subject headers nil)
+    (message-goto-body)
+    (setq patched-html (with-temp-buffer
+                         (insert html)
+                         (goto-char (point-min))
+                         (run-hooks 'org-mime-pre-html-hook)
+                         (buffer-string)))
+    ;; insert text
+    (org-mime-insert-html-content plain file patched-html export-opts)))
 
 (defun org-mime-extract-keywords ()
-  "Extract keyword from "
+  "Extract keywords."
   (cond
    ((>= (org-mime-org-major-version) 9)
     (org-element-map (org-element-parse-buffer) 'keyword
@@ -490,18 +481,14 @@ If SUBTREEP is t, curret org node is subtree."
     (message "Warning: org-element-map is not available. File keywords will not work.")
     '())))
 
-(defun org-mime-build-mail-other-headers (cc bcc)
-  "Build mail header from CC and BCC."
-  (cond
-   ((and cc bcc)
-    (list (cons "Cc" cc)
-          (cons "Bcc" bcc)))
-   (cc
-    (list (cons "Cc" cc)))
-   (bcc
-    (list (cons "Bcc" bcc)))
-   (t
-    nil)))
+(defun org-mime-build-mail-other-headers (cc bcc from)
+  "Build mail header from CC, BCC, and FROM."
+  (let* ((arr (list (cons "Cc" cc) (cons "Bcc" bcc)  (cons "From" from )))
+         rlt)
+    (dolist (e arr)
+      (when (cdr e)
+        (push e rlt)))
+    rlt))
 
 ;;;###autoload
 (defun org-mime-org-buffer-htmlize ()
@@ -514,6 +501,7 @@ The following file keywords can be used to control the headers:
 #+MAIL_SUBJECT: a subject line
 #+MAIL_CC: some2@some.place
 #+MAIL_BCC: some3@some.place
+#+MAIL_FROM: sender@some.place
 
 The cursor ends in the TO field."
   (interactive)
@@ -527,46 +515,57 @@ The cursor ends in the TO field."
                       (if (not file) (buffer-name (buffer-base-buffer))
                         (file-name-sans-extension
                          (file-name-nondirectory file)))))
-         (body (org-mime-get-exported-content 'html nil))
+         (exported (org-mime-export-buffer-or-subtree nil))
          (to (cdr (assoc "MAIL_TO" keywords)))
          (cc (cdr (assoc "MAIL_CC" keywords)))
          (bcc (cdr (assoc "MAIL_BCC" keywords)))
-         (other-headers (org-mime-build-mail-other-headers cc bcc)))
-    (org-mime-compose body file to subject other-headers nil)
+         (from (cdr (assoc "MAIL_FROM" keywords)))
+         (other-headers (org-mime-build-mail-other-headers cc bcc from)))
+    (org-mime-compose exported file to subject other-headers nil)
     (message-goto-to)))
 
 (defun org-mime-org-major-version ()
   "Get Org major version."
   (string-to-number (car (split-string (org-release) "\\."))))
 
-;; TODO integrating patch
+(defun org-mime-attr (p)
+  (org-entry-get nil p org-mime-use-property-inheritance))
+
 ;;;###autoload
-(defun org-mime-org-subtree-htmlize ()
-  "Create an email buffer of the current subtree.
-The buffer will contain both html and in org formats as mime
-alternatives.
+(defun org-mime-org-subtree-htmlize (&optional htmlize-first-level)
+  "Create an email buffer of the current subtree.  If HTMLIZE-FIRST-LEVEL is
+not nil, the first level subtree which containing current subtree is htmlized.
 
-The following headline properties can determine the headers.
+Following headline properties can determine the mail headers,
 * subtree heading
-   :PROPERTIES:
-   :MAIL_SUBJECT: mail title
-   :MAIL_TO: person1@gmail.com
-   :MAIL_CC: person2@gmail.com
-   :MAIL_BCC: person3@gmail.com
-   :END:
-
-The cursor is left in the TO field."
-  (interactive)
+  :PROPERTIES:
+  :MAIL_SUBJECT: mail title
+  :MAIL_TO: person1@gmail.com
+  :MAIL_CC: person2@gmail.com
+  :MAIL_BCC: person3@gmail.com
+  :MAIL_FROM: sender@gmail.com
+  :END:
+"
+  (interactive "P")
   (save-excursion
-    (funcall org-mime-up-subtree-heading)
-    (cl-flet ((mp (p) (org-entry-get nil p org-mime-use-property-inheritance)))
+    (org-back-to-heading)
+
+    (when (and htmlize-first-level
+               (not (string-match "^\\* " (org-mime-current-line))))
+      ;; go back to the 1st level substree
+      (re-search-backward "^\\* ")
+      (org-back-to-heading))
+
+    (when (outline-on-heading-p nil)
       (let* ((file (buffer-file-name (current-buffer)))
-             (subject (or (mp "MAIL_SUBJECT") (nth 4 (org-heading-components))))
-             (to (mp "MAIL_TO"))
-             (cc (mp "MAIL_CC"))
-             (bcc (mp "MAIL_BCC"))
+             (subject (or (org-mime-attr "MAIL_SUBJECT")
+                          (nth 4 (org-heading-components))))
+             (to (org-mime-attr "MAIL_TO"))
+             (cc (org-mime-attr "MAIL_CC"))
+             (bcc (org-mime-attr "MAIL_BCC"))
+             (from (org-mime-attr "MAIL_FROM"))
              ;; Thanks to Matt Price improving handling of cc & bcc headers
-             (other-headers (org-mime-build-mail-other-headers cc bcc))
+             (other-headers (org-mime-build-mail-other-headers cc bcc from))
              (org-export-show-temporary-export-buffer nil)
              (subtree-opts (when (fboundp 'org-export--get-subtree-options)
                              (org-export--get-subtree-options)))
@@ -575,16 +574,11 @@ The cursor is left in the TO field."
              ;; I wrap these bodies in export blocks because in org-mime-compose
              ;; they get exported again. This makes each block conditionally
              ;; exposed depending on the backend.
-             (org-body (save-restriction
-                        (org-narrow-to-subtree)
-                        (org-mime-get-exported-content 'org t)))
-             (html-body (save-restriction
-                         (org-narrow-to-subtree)
-                         (org-mime-get-exported-content 'html t)))
-             (body (concat org-body "\n" html-body)))
+             (exported (save-restriction (org-narrow-to-subtree)
+                                          (org-mime-export-buffer-or-subtree t))))
         (save-restriction
           (org-narrow-to-subtree)
-          (org-mime-compose body file to subject other-headers t))
+          (org-mime-compose exported file to subject other-headers t))
         (message-goto-to)))))
 
 (provide 'org-mime)
diff --git a/elpa/org-plus-contrib-20190930/COPYING b/elpa/org-plus-contrib-20191028/COPYING
similarity index 100%
rename from elpa/org-plus-contrib-20190930/COPYING
rename to elpa/org-plus-contrib-20191028/COPYING
diff --git a/elpa/org-plus-contrib-20190930/README_ELPA b/elpa/org-plus-contrib-20191028/README_ELPA
similarity index 100%
rename from elpa/org-plus-contrib-20190930/README_ELPA
rename to elpa/org-plus-contrib-20191028/README_ELPA
diff --git a/elpa/org-plus-contrib-20190930/dir b/elpa/org-plus-contrib-20191028/dir
similarity index 100%
rename from elpa/org-plus-contrib-20190930/dir
rename to elpa/org-plus-contrib-20191028/dir
diff --git a/elpa/org-plus-contrib-20190930/etc/ORG-NEWS b/elpa/org-plus-contrib-20191028/etc/ORG-NEWS
similarity index 100%
rename from elpa/org-plus-contrib-20190930/etc/ORG-NEWS
rename to elpa/org-plus-contrib-20191028/etc/ORG-NEWS
diff --git a/elpa/org-plus-contrib-20190930/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-plus-contrib-20191028/etc/styles/OrgOdtContentTemplate.xml
similarity index 100%
rename from elpa/org-plus-contrib-20190930/etc/styles/OrgOdtContentTemplate.xml
rename to elpa/org-plus-contrib-20191028/etc/styles/OrgOdtContentTemplate.xml
diff --git a/elpa/org-plus-contrib-20190930/etc/styles/OrgOdtStyles.xml b/elpa/org-plus-contrib-20191028/etc/styles/OrgOdtStyles.xml
similarity index 100%
rename from elpa/org-plus-contrib-20190930/etc/styles/OrgOdtStyles.xml
rename to elpa/org-plus-contrib-20191028/etc/styles/OrgOdtStyles.xml
diff --git a/elpa/org-plus-contrib-20190930/etc/styles/README b/elpa/org-plus-contrib-20191028/etc/styles/README
similarity index 100%
rename from elpa/org-plus-contrib-20190930/etc/styles/README
rename to elpa/org-plus-contrib-20191028/etc/styles/README
diff --git a/elpa/org-plus-contrib-20190930/ob-C.el b/elpa/org-plus-contrib-20191028/ob-C.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-C.el
rename to elpa/org-plus-contrib-20191028/ob-C.el
diff --git a/elpa/org-plus-contrib-20190930/ob-J.el b/elpa/org-plus-contrib-20191028/ob-J.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-J.el
rename to elpa/org-plus-contrib-20191028/ob-J.el
diff --git a/elpa/org-plus-contrib-20190930/ob-R.el b/elpa/org-plus-contrib-20191028/ob-R.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-R.el
rename to elpa/org-plus-contrib-20191028/ob-R.el
diff --git a/elpa/org-plus-contrib-20190930/ob-abc.el b/elpa/org-plus-contrib-20191028/ob-abc.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-abc.el
rename to elpa/org-plus-contrib-20191028/ob-abc.el
diff --git a/elpa/org-plus-contrib-20190930/ob-arduino.el b/elpa/org-plus-contrib-20191028/ob-arduino.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-arduino.el
rename to elpa/org-plus-contrib-20191028/ob-arduino.el
diff --git a/elpa/org-plus-contrib-20190930/ob-asymptote.el b/elpa/org-plus-contrib-20191028/ob-asymptote.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-asymptote.el
rename to elpa/org-plus-contrib-20191028/ob-asymptote.el
diff --git a/elpa/org-plus-contrib-20190930/ob-awk.el b/elpa/org-plus-contrib-20191028/ob-awk.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-awk.el
rename to elpa/org-plus-contrib-20191028/ob-awk.el
diff --git a/elpa/org-plus-contrib-20190930/ob-calc.el b/elpa/org-plus-contrib-20191028/ob-calc.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-calc.el
rename to elpa/org-plus-contrib-20191028/ob-calc.el
diff --git a/elpa/org-plus-contrib-20190930/ob-clojure-literate.el b/elpa/org-plus-contrib-20191028/ob-clojure-literate.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-clojure-literate.el
rename to elpa/org-plus-contrib-20191028/ob-clojure-literate.el
diff --git a/elpa/org-plus-contrib-20190930/ob-clojure.el b/elpa/org-plus-contrib-20191028/ob-clojure.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-clojure.el
rename to elpa/org-plus-contrib-20191028/ob-clojure.el
diff --git a/elpa/org-plus-contrib-20190930/ob-comint.el b/elpa/org-plus-contrib-20191028/ob-comint.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-comint.el
rename to elpa/org-plus-contrib-20191028/ob-comint.el
diff --git a/elpa/org-plus-contrib-20190930/ob-coq.el b/elpa/org-plus-contrib-20191028/ob-coq.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-coq.el
rename to elpa/org-plus-contrib-20191028/ob-coq.el
diff --git a/elpa/org-plus-contrib-20190930/ob-core.el b/elpa/org-plus-contrib-20191028/ob-core.el
similarity index 99%
rename from elpa/org-plus-contrib-20190930/ob-core.el
rename to elpa/org-plus-contrib-20191028/ob-core.el
index 6f4101f6..9a9409ea 100644
--- a/elpa/org-plus-contrib-20190930/ob-core.el
+++ b/elpa/org-plus-contrib-20191028/ob-core.el
@@ -526,7 +526,7 @@ to raise errors for all languages.")
   "Hook for functions to be called after `org-babel-execute-src-block'")
 
 (defun org-babel-named-src-block-regexp-for-name (&optional name)
-  "This generates a regexp used to match a source block named NAME.
+  "Generate a regexp used to match a source block named NAME.
 If NAME is nil, match any name.  Matched name is then put in
 match group 9.  Other match groups are defined in
 `org-babel-src-block-regexp'."
@@ -537,7 +537,7 @@ match group 9.  Other match groups are defined in
 	  (substring org-babel-src-block-regexp 1)))
 
 (defun org-babel-named-data-regexp-for-name (name)
-  "This generates a regexp used to match data named NAME."
+  "Generate a regexp used to match data named NAME."
   (concat org-babel-name-regexp (regexp-quote name) "[ \t]*$"))
 
 (defun org-babel--normalize-body (datum)
@@ -1789,7 +1789,7 @@ to `org-babel-named-src-block-regexp'."
 	  (ignore-errors (org-next-block 1 nil regexp))))))
 
 (defun org-babel-src-block-names (&optional file)
-  "Returns the names of source blocks in FILE or the current buffer."
+  "Return the names of source blocks in FILE or the current buffer."
   (with-current-buffer (if file (find-file-noselect file) (current-buffer))
     (org-with-point-at 1
       (let ((regexp "^[ \t]*#\\+begin_src ")
@@ -1834,7 +1834,7 @@ buffer or nil if no such result exists."
 	      (throw :found (line-beginning-position)))))))))
 
 (defun org-babel-result-names (&optional file)
-  "Returns the names of results in FILE or the current buffer."
+  "Return the names of results in FILE or the current buffer."
   (save-excursion
     (when file (find-file file)) (goto-char (point-min))
     (let ((case-fold-search t) names)
diff --git a/elpa/org-plus-contrib-20190930/ob-csharp.el b/elpa/org-plus-contrib-20191028/ob-csharp.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-csharp.el
rename to elpa/org-plus-contrib-20191028/ob-csharp.el
diff --git a/elpa/org-plus-contrib-20190930/ob-css.el b/elpa/org-plus-contrib-20191028/ob-css.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-css.el
rename to elpa/org-plus-contrib-20191028/ob-css.el
diff --git a/elpa/org-plus-contrib-20190930/ob-ditaa.el b/elpa/org-plus-contrib-20191028/ob-ditaa.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-ditaa.el
rename to elpa/org-plus-contrib-20191028/ob-ditaa.el
diff --git a/elpa/org-plus-contrib-20190930/ob-dot.el b/elpa/org-plus-contrib-20191028/ob-dot.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-dot.el
rename to elpa/org-plus-contrib-20191028/ob-dot.el
diff --git a/elpa/org-plus-contrib-20190930/ob-ebnf.el b/elpa/org-plus-contrib-20191028/ob-ebnf.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-ebnf.el
rename to elpa/org-plus-contrib-20191028/ob-ebnf.el
diff --git a/elpa/org-plus-contrib-20190930/ob-emacs-lisp.el b/elpa/org-plus-contrib-20191028/ob-emacs-lisp.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-emacs-lisp.el
rename to elpa/org-plus-contrib-20191028/ob-emacs-lisp.el
diff --git a/elpa/org-plus-contrib-20190930/ob-eukleides.el b/elpa/org-plus-contrib-20191028/ob-eukleides.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-eukleides.el
rename to elpa/org-plus-contrib-20191028/ob-eukleides.el
diff --git a/elpa/org-plus-contrib-20190930/ob-eval.el b/elpa/org-plus-contrib-20191028/ob-eval.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-eval.el
rename to elpa/org-plus-contrib-20191028/ob-eval.el
diff --git a/elpa/org-plus-contrib-20190930/ob-exp.el b/elpa/org-plus-contrib-20191028/ob-exp.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-exp.el
rename to elpa/org-plus-contrib-20191028/ob-exp.el
diff --git a/elpa/org-plus-contrib-20190930/ob-fomus.el b/elpa/org-plus-contrib-20191028/ob-fomus.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-fomus.el
rename to elpa/org-plus-contrib-20191028/ob-fomus.el
diff --git a/elpa/org-plus-contrib-20190930/ob-forth.el b/elpa/org-plus-contrib-20191028/ob-forth.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-forth.el
rename to elpa/org-plus-contrib-20191028/ob-forth.el
diff --git a/elpa/org-plus-contrib-20190930/ob-fortran.el b/elpa/org-plus-contrib-20191028/ob-fortran.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-fortran.el
rename to elpa/org-plus-contrib-20191028/ob-fortran.el
diff --git a/elpa/org-plus-contrib-20190930/ob-gnuplot.el b/elpa/org-plus-contrib-20191028/ob-gnuplot.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-gnuplot.el
rename to elpa/org-plus-contrib-20191028/ob-gnuplot.el
diff --git a/elpa/org-plus-contrib-20190930/ob-groovy.el b/elpa/org-plus-contrib-20191028/ob-groovy.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-groovy.el
rename to elpa/org-plus-contrib-20191028/ob-groovy.el
diff --git a/elpa/org-plus-contrib-20190930/ob-haskell.el b/elpa/org-plus-contrib-20191028/ob-haskell.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-haskell.el
rename to elpa/org-plus-contrib-20191028/ob-haskell.el
diff --git a/elpa/org-plus-contrib-20190930/ob-hledger.el b/elpa/org-plus-contrib-20191028/ob-hledger.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-hledger.el
rename to elpa/org-plus-contrib-20191028/ob-hledger.el
diff --git a/elpa/org-plus-contrib-20190930/ob-io.el b/elpa/org-plus-contrib-20191028/ob-io.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-io.el
rename to elpa/org-plus-contrib-20191028/ob-io.el
diff --git a/elpa/org-plus-contrib-20190930/ob-java.el b/elpa/org-plus-contrib-20191028/ob-java.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-java.el
rename to elpa/org-plus-contrib-20191028/ob-java.el
diff --git a/elpa/org-plus-contrib-20190930/ob-js.el b/elpa/org-plus-contrib-20191028/ob-js.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-js.el
rename to elpa/org-plus-contrib-20191028/ob-js.el
diff --git a/elpa/org-plus-contrib-20190930/ob-julia.el b/elpa/org-plus-contrib-20191028/ob-julia.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-julia.el
rename to elpa/org-plus-contrib-20191028/ob-julia.el
diff --git a/elpa/org-plus-contrib-20190930/ob-keys.el b/elpa/org-plus-contrib-20191028/ob-keys.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-keys.el
rename to elpa/org-plus-contrib-20191028/ob-keys.el
diff --git a/elpa/org-plus-contrib-20190930/ob-latex.el b/elpa/org-plus-contrib-20191028/ob-latex.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-latex.el
rename to elpa/org-plus-contrib-20191028/ob-latex.el
diff --git a/elpa/org-plus-contrib-20190930/ob-ledger.el b/elpa/org-plus-contrib-20191028/ob-ledger.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-ledger.el
rename to elpa/org-plus-contrib-20191028/ob-ledger.el
diff --git a/elpa/org-plus-contrib-20190930/ob-lilypond.el b/elpa/org-plus-contrib-20191028/ob-lilypond.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-lilypond.el
rename to elpa/org-plus-contrib-20191028/ob-lilypond.el
diff --git a/elpa/org-plus-contrib-20190930/ob-lisp.el b/elpa/org-plus-contrib-20191028/ob-lisp.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-lisp.el
rename to elpa/org-plus-contrib-20191028/ob-lisp.el
diff --git a/elpa/org-plus-contrib-20190930/ob-lob.el b/elpa/org-plus-contrib-20191028/ob-lob.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-lob.el
rename to elpa/org-plus-contrib-20191028/ob-lob.el
diff --git a/elpa/org-plus-contrib-20190930/ob-lua.el b/elpa/org-plus-contrib-20191028/ob-lua.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-lua.el
rename to elpa/org-plus-contrib-20191028/ob-lua.el
diff --git a/elpa/org-plus-contrib-20190930/ob-makefile.el b/elpa/org-plus-contrib-20191028/ob-makefile.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-makefile.el
rename to elpa/org-plus-contrib-20191028/ob-makefile.el
diff --git a/elpa/org-plus-contrib-20190930/ob-mathematica.el b/elpa/org-plus-contrib-20191028/ob-mathematica.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-mathematica.el
rename to elpa/org-plus-contrib-20191028/ob-mathematica.el
diff --git a/elpa/org-plus-contrib-20190930/ob-mathomatic.el b/elpa/org-plus-contrib-20191028/ob-mathomatic.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-mathomatic.el
rename to elpa/org-plus-contrib-20191028/ob-mathomatic.el
diff --git a/elpa/org-plus-contrib-20190930/ob-matlab.el b/elpa/org-plus-contrib-20191028/ob-matlab.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-matlab.el
rename to elpa/org-plus-contrib-20191028/ob-matlab.el
diff --git a/elpa/org-plus-contrib-20190930/ob-maxima.el b/elpa/org-plus-contrib-20191028/ob-maxima.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-maxima.el
rename to elpa/org-plus-contrib-20191028/ob-maxima.el
diff --git a/elpa/org-plus-contrib-20190930/ob-mscgen.el b/elpa/org-plus-contrib-20191028/ob-mscgen.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-mscgen.el
rename to elpa/org-plus-contrib-20191028/ob-mscgen.el
diff --git a/elpa/org-plus-contrib-20190930/ob-ocaml.el b/elpa/org-plus-contrib-20191028/ob-ocaml.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-ocaml.el
rename to elpa/org-plus-contrib-20191028/ob-ocaml.el
diff --git a/elpa/org-plus-contrib-20190930/ob-octave.el b/elpa/org-plus-contrib-20191028/ob-octave.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-octave.el
rename to elpa/org-plus-contrib-20191028/ob-octave.el
diff --git a/elpa/org-plus-contrib-20190930/ob-org.el b/elpa/org-plus-contrib-20191028/ob-org.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-org.el
rename to elpa/org-plus-contrib-20191028/ob-org.el
diff --git a/elpa/org-plus-contrib-20190930/ob-oz.el b/elpa/org-plus-contrib-20191028/ob-oz.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-oz.el
rename to elpa/org-plus-contrib-20191028/ob-oz.el
diff --git a/elpa/org-plus-contrib-20190930/ob-perl.el b/elpa/org-plus-contrib-20191028/ob-perl.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-perl.el
rename to elpa/org-plus-contrib-20191028/ob-perl.el
diff --git a/elpa/org-plus-contrib-20190930/ob-php.el b/elpa/org-plus-contrib-20191028/ob-php.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-php.el
rename to elpa/org-plus-contrib-20191028/ob-php.el
diff --git a/elpa/org-plus-contrib-20190930/ob-picolisp.el b/elpa/org-plus-contrib-20191028/ob-picolisp.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-picolisp.el
rename to elpa/org-plus-contrib-20191028/ob-picolisp.el
diff --git a/elpa/org-plus-contrib-20190930/ob-plantuml.el b/elpa/org-plus-contrib-20191028/ob-plantuml.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-plantuml.el
rename to elpa/org-plus-contrib-20191028/ob-plantuml.el
diff --git a/elpa/org-plus-contrib-20190930/ob-processing.el b/elpa/org-plus-contrib-20191028/ob-processing.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-processing.el
rename to elpa/org-plus-contrib-20191028/ob-processing.el
diff --git a/elpa/org-plus-contrib-20190930/ob-python.el b/elpa/org-plus-contrib-20191028/ob-python.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-python.el
rename to elpa/org-plus-contrib-20191028/ob-python.el
diff --git a/elpa/org-plus-contrib-20190930/ob-redis.el b/elpa/org-plus-contrib-20191028/ob-redis.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-redis.el
rename to elpa/org-plus-contrib-20191028/ob-redis.el
diff --git a/elpa/org-plus-contrib-20190930/ob-ref.el b/elpa/org-plus-contrib-20191028/ob-ref.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-ref.el
rename to elpa/org-plus-contrib-20191028/ob-ref.el
diff --git a/elpa/org-plus-contrib-20190930/ob-ruby.el b/elpa/org-plus-contrib-20191028/ob-ruby.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-ruby.el
rename to elpa/org-plus-contrib-20191028/ob-ruby.el
diff --git a/elpa/org-plus-contrib-20190930/ob-sass.el b/elpa/org-plus-contrib-20191028/ob-sass.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-sass.el
rename to elpa/org-plus-contrib-20191028/ob-sass.el
diff --git a/elpa/org-plus-contrib-20190930/ob-scheme.el b/elpa/org-plus-contrib-20191028/ob-scheme.el
similarity index 99%
rename from elpa/org-plus-contrib-20190930/ob-scheme.el
rename to elpa/org-plus-contrib-20191028/ob-scheme.el
index 251ed52b..21d9fad2 100644
--- a/elpa/org-plus-contrib-20190930/ob-scheme.el
+++ b/elpa/org-plus-contrib-20191028/ob-scheme.el
@@ -102,7 +102,7 @@
   (puthash session-name buffer org-babel-scheme-repl-map))
 
 (defun org-babel-scheme-get-buffer-impl (buffer)
-  "Returns the scheme implementation geiser associates with the buffer."
+  "Return the scheme implementation geiser associates with the buffer."
   (with-current-buffer (set-buffer buffer)
     geiser-impl--implementation))
 
diff --git a/elpa/org-plus-contrib-20190930/ob-sclang.el b/elpa/org-plus-contrib-20191028/ob-sclang.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-sclang.el
rename to elpa/org-plus-contrib-20191028/ob-sclang.el
diff --git a/elpa/org-plus-contrib-20190930/ob-screen.el b/elpa/org-plus-contrib-20191028/ob-screen.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-screen.el
rename to elpa/org-plus-contrib-20191028/ob-screen.el
diff --git a/elpa/org-plus-contrib-20190930/ob-sed.el b/elpa/org-plus-contrib-20191028/ob-sed.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-sed.el
rename to elpa/org-plus-contrib-20191028/ob-sed.el
diff --git a/elpa/org-20190930/ob-shell.el b/elpa/org-plus-contrib-20191028/ob-shell.el
similarity index 97%
rename from elpa/org-20190930/ob-shell.el
rename to elpa/org-plus-contrib-20191028/ob-shell.el
index 66c28f7f..88342bab 100644
--- a/elpa/org-20190930/ob-shell.el
+++ b/elpa/org-plus-contrib-20191028/ob-shell.el
@@ -112,12 +112,12 @@ This function is called by `org-babel-execute-src-block'."
 ;;; Helper functions
 (defun org-babel--variable-assignments:sh-generic
     (varname values &optional sep hline)
-  "Returns a list of statements declaring the values as a generic variable."
+  "Return a list of statements declaring the values as a generic variable."
   (format "%s=%s" varname (org-babel-sh-var-to-sh values sep hline)))
 
 (defun org-babel--variable-assignments:bash_array
     (varname values &optional sep hline)
-  "Returns a list of statements declaring the values as a bash array."
+  "Return a list of statements declaring the values as a bash array."
   (format "unset %s\ndeclare -a %s=( %s )"
 	  varname varname
 	  (mapconcat
@@ -127,7 +127,7 @@ This function is called by `org-babel-execute-src-block'."
 
 (defun org-babel--variable-assignments:bash_assoc
     (varname values &optional sep hline)
-  "Returns a list of statements declaring the values as bash associative array."
+  "Return a list of statements declaring the values as bash associative array."
   (format "unset %s\ndeclare -A %s\n%s"
     varname varname
     (mapconcat
@@ -140,7 +140,7 @@ This function is called by `org-babel-execute-src-block'."
      "\n")))
 
 (defun org-babel--variable-assignments:bash (varname values &optional sep hline)
-  "Represents the parameters as useful Bash shell variables."
+  "Represent the parameters as useful Bash shell variables."
   (pcase values
     (`((,_ ,_ . ,_) . ,_)		;two-dimensional array
      (org-babel--variable-assignments:bash_assoc varname values sep hline))
diff --git a/elpa/org-plus-contrib-20190930/ob-shen.el b/elpa/org-plus-contrib-20191028/ob-shen.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-shen.el
rename to elpa/org-plus-contrib-20191028/ob-shen.el
diff --git a/elpa/org-plus-contrib-20190930/ob-smiles.el b/elpa/org-plus-contrib-20191028/ob-smiles.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-smiles.el
rename to elpa/org-plus-contrib-20191028/ob-smiles.el
diff --git a/elpa/org-plus-contrib-20190930/ob-spice.el b/elpa/org-plus-contrib-20191028/ob-spice.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-spice.el
rename to elpa/org-plus-contrib-20191028/ob-spice.el
diff --git a/elpa/org-plus-contrib-20190930/ob-sql.el b/elpa/org-plus-contrib-20191028/ob-sql.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-sql.el
rename to elpa/org-plus-contrib-20191028/ob-sql.el
diff --git a/elpa/org-plus-contrib-20190930/ob-sqlite.el b/elpa/org-plus-contrib-20191028/ob-sqlite.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-sqlite.el
rename to elpa/org-plus-contrib-20191028/ob-sqlite.el
diff --git a/elpa/org-plus-contrib-20190930/ob-stan.el b/elpa/org-plus-contrib-20191028/ob-stan.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-stan.el
rename to elpa/org-plus-contrib-20191028/ob-stan.el
diff --git a/elpa/org-plus-contrib-20190930/ob-stata.el b/elpa/org-plus-contrib-20191028/ob-stata.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-stata.el
rename to elpa/org-plus-contrib-20191028/ob-stata.el
diff --git a/elpa/org-plus-contrib-20190930/ob-table.el b/elpa/org-plus-contrib-20191028/ob-table.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-table.el
rename to elpa/org-plus-contrib-20191028/ob-table.el
diff --git a/elpa/org-plus-contrib-20190930/ob-tangle.el b/elpa/org-plus-contrib-20191028/ob-tangle.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-tangle.el
rename to elpa/org-plus-contrib-20191028/ob-tangle.el
diff --git a/elpa/org-plus-contrib-20190930/ob-tcl.el b/elpa/org-plus-contrib-20191028/ob-tcl.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-tcl.el
rename to elpa/org-plus-contrib-20191028/ob-tcl.el
diff --git a/elpa/org-plus-contrib-20190930/ob-vala.el b/elpa/org-plus-contrib-20191028/ob-vala.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-vala.el
rename to elpa/org-plus-contrib-20191028/ob-vala.el
diff --git a/elpa/org-plus-contrib-20190930/ob-vbnet.el b/elpa/org-plus-contrib-20191028/ob-vbnet.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob-vbnet.el
rename to elpa/org-plus-contrib-20191028/ob-vbnet.el
diff --git a/elpa/org-plus-contrib-20190930/ob.el b/elpa/org-plus-contrib-20191028/ob.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ob.el
rename to elpa/org-plus-contrib-20191028/ob.el
diff --git a/elpa/org-plus-contrib-20190930/org b/elpa/org-plus-contrib-20191028/org
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org
rename to elpa/org-plus-contrib-20191028/org
diff --git a/elpa/org-plus-contrib-20190930/org-agenda.el b/elpa/org-plus-contrib-20191028/org-agenda.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-agenda.el
rename to elpa/org-plus-contrib-20191028/org-agenda.el
diff --git a/elpa/org-plus-contrib-20190930/org-annotate-file.el b/elpa/org-plus-contrib-20191028/org-annotate-file.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-annotate-file.el
rename to elpa/org-plus-contrib-20191028/org-annotate-file.el
diff --git a/elpa/org-plus-contrib-20190930/org-archive.el b/elpa/org-plus-contrib-20191028/org-archive.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-archive.el
rename to elpa/org-plus-contrib-20191028/org-archive.el
diff --git a/elpa/org-plus-contrib-20190930/org-attach-embedded-images.el b/elpa/org-plus-contrib-20191028/org-attach-embedded-images.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-attach-embedded-images.el
rename to elpa/org-plus-contrib-20191028/org-attach-embedded-images.el
diff --git a/elpa/org-plus-contrib-20190930/org-attach.el b/elpa/org-plus-contrib-20191028/org-attach.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-attach.el
rename to elpa/org-plus-contrib-20191028/org-attach.el
diff --git a/elpa/org-plus-contrib-20190930/org-bbdb.el b/elpa/org-plus-contrib-20191028/org-bbdb.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-bbdb.el
rename to elpa/org-plus-contrib-20191028/org-bbdb.el
diff --git a/elpa/org-plus-contrib-20190930/org-bibtex-extras.el b/elpa/org-plus-contrib-20191028/org-bibtex-extras.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-bibtex-extras.el
rename to elpa/org-plus-contrib-20191028/org-bibtex-extras.el
diff --git a/elpa/org-plus-contrib-20190930/org-bibtex.el b/elpa/org-plus-contrib-20191028/org-bibtex.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-bibtex.el
rename to elpa/org-plus-contrib-20191028/org-bibtex.el
diff --git a/elpa/org-plus-contrib-20190930/org-bookmark.el b/elpa/org-plus-contrib-20191028/org-bookmark.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-bookmark.el
rename to elpa/org-plus-contrib-20191028/org-bookmark.el
diff --git a/elpa/org-plus-contrib-20190930/org-capture.el b/elpa/org-plus-contrib-20191028/org-capture.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-capture.el
rename to elpa/org-plus-contrib-20191028/org-capture.el
diff --git a/elpa/org-plus-contrib-20190930/org-checklist.el b/elpa/org-plus-contrib-20191028/org-checklist.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-checklist.el
rename to elpa/org-plus-contrib-20191028/org-checklist.el
diff --git a/elpa/org-plus-contrib-20190930/org-choose.el b/elpa/org-plus-contrib-20191028/org-choose.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-choose.el
rename to elpa/org-plus-contrib-20191028/org-choose.el
diff --git a/elpa/org-plus-contrib-20190930/org-clock.el b/elpa/org-plus-contrib-20191028/org-clock.el
similarity index 99%
rename from elpa/org-plus-contrib-20190930/org-clock.el
rename to elpa/org-plus-contrib-20191028/org-clock.el
index d0548d00..1761f693 100644
--- a/elpa/org-plus-contrib-20190930/org-clock.el
+++ b/elpa/org-plus-contrib-20191028/org-clock.el
@@ -2054,7 +2054,7 @@ in the buffer and update it."
   (org-update-dblock))
 
 (defun org-day-of-week (day month year)
-  "Returns the day of the week as an integer."
+  "Return the day of the week as an integer."
   (nth 6
        (decode-time
 	(date-to-time
diff --git a/elpa/org-plus-contrib-20190930/org-collector.el b/elpa/org-plus-contrib-20191028/org-collector.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-collector.el
rename to elpa/org-plus-contrib-20191028/org-collector.el
diff --git a/elpa/org-plus-contrib-20190930/org-colview.el b/elpa/org-plus-contrib-20191028/org-colview.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-colview.el
rename to elpa/org-plus-contrib-20191028/org-colview.el
diff --git a/elpa/org-plus-contrib-20190930/org-compat.el b/elpa/org-plus-contrib-20191028/org-compat.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-compat.el
rename to elpa/org-plus-contrib-20191028/org-compat.el
diff --git a/elpa/org-plus-contrib-20190930/org-contacts.el b/elpa/org-plus-contrib-20191028/org-contacts.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-contacts.el
rename to elpa/org-plus-contrib-20191028/org-contacts.el
diff --git a/elpa/org-plus-contrib-20190930/org-contribdir.el b/elpa/org-plus-contrib-20191028/org-contribdir.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-contribdir.el
rename to elpa/org-plus-contrib-20191028/org-contribdir.el
diff --git a/elpa/org-plus-contrib-20190930/org-crypt.el b/elpa/org-plus-contrib-20191028/org-crypt.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-crypt.el
rename to elpa/org-plus-contrib-20191028/org-crypt.el
diff --git a/elpa/org-plus-contrib-20190930/org-ctags.el b/elpa/org-plus-contrib-20191028/org-ctags.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-ctags.el
rename to elpa/org-plus-contrib-20191028/org-ctags.el
diff --git a/elpa/org-plus-contrib-20190930/org-datetree.el b/elpa/org-plus-contrib-20191028/org-datetree.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-datetree.el
rename to elpa/org-plus-contrib-20191028/org-datetree.el
diff --git a/elpa/org-plus-contrib-20190930/org-depend.el b/elpa/org-plus-contrib-20191028/org-depend.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-depend.el
rename to elpa/org-plus-contrib-20191028/org-depend.el
diff --git a/elpa/org-plus-contrib-20190930/org-docview.el b/elpa/org-plus-contrib-20191028/org-docview.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-docview.el
rename to elpa/org-plus-contrib-20191028/org-docview.el
diff --git a/elpa/org-plus-contrib-20190930/org-drill.el b/elpa/org-plus-contrib-20191028/org-drill.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-drill.el
rename to elpa/org-plus-contrib-20191028/org-drill.el
diff --git a/elpa/org-plus-contrib-20190930/org-duration.el b/elpa/org-plus-contrib-20191028/org-duration.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-duration.el
rename to elpa/org-plus-contrib-20191028/org-duration.el
diff --git a/elpa/org-plus-contrib-20190930/org-effectiveness.el b/elpa/org-plus-contrib-20191028/org-effectiveness.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-effectiveness.el
rename to elpa/org-plus-contrib-20191028/org-effectiveness.el
diff --git a/elpa/org-plus-contrib-20190930/org-eldoc.el b/elpa/org-plus-contrib-20191028/org-eldoc.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-eldoc.el
rename to elpa/org-plus-contrib-20191028/org-eldoc.el
diff --git a/elpa/org-plus-contrib-20190930/org-element.el b/elpa/org-plus-contrib-20191028/org-element.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-element.el
rename to elpa/org-plus-contrib-20191028/org-element.el
diff --git a/elpa/org-plus-contrib-20190930/org-elisp-symbol.el b/elpa/org-plus-contrib-20191028/org-elisp-symbol.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-elisp-symbol.el
rename to elpa/org-plus-contrib-20191028/org-elisp-symbol.el
diff --git a/elpa/org-plus-contrib-20190930/org-entities.el b/elpa/org-plus-contrib-20191028/org-entities.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-entities.el
rename to elpa/org-plus-contrib-20191028/org-entities.el
diff --git a/elpa/org-plus-contrib-20190930/org-eshell.el b/elpa/org-plus-contrib-20191028/org-eshell.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-eshell.el
rename to elpa/org-plus-contrib-20191028/org-eshell.el
diff --git a/elpa/org-plus-contrib-20190930/org-eval-light.el b/elpa/org-plus-contrib-20191028/org-eval-light.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-eval-light.el
rename to elpa/org-plus-contrib-20191028/org-eval-light.el
diff --git a/elpa/org-plus-contrib-20190930/org-eval.el b/elpa/org-plus-contrib-20191028/org-eval.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-eval.el
rename to elpa/org-plus-contrib-20191028/org-eval.el
diff --git a/elpa/org-plus-contrib-20190930/org-eww.el b/elpa/org-plus-contrib-20191028/org-eww.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-eww.el
rename to elpa/org-plus-contrib-20191028/org-eww.el
diff --git a/elpa/org-plus-contrib-20190930/org-expiry.el b/elpa/org-plus-contrib-20191028/org-expiry.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-expiry.el
rename to elpa/org-plus-contrib-20191028/org-expiry.el
diff --git a/elpa/org-plus-contrib-20190930/org-faces.el b/elpa/org-plus-contrib-20191028/org-faces.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-faces.el
rename to elpa/org-plus-contrib-20191028/org-faces.el
diff --git a/elpa/org-plus-contrib-20190930/org-feed.el b/elpa/org-plus-contrib-20191028/org-feed.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-feed.el
rename to elpa/org-plus-contrib-20191028/org-feed.el
diff --git a/elpa/org-plus-contrib-20190930/org-footnote.el b/elpa/org-plus-contrib-20191028/org-footnote.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-footnote.el
rename to elpa/org-plus-contrib-20191028/org-footnote.el
diff --git a/elpa/org-plus-contrib-20190930/org-git-link.el b/elpa/org-plus-contrib-20191028/org-git-link.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-git-link.el
rename to elpa/org-plus-contrib-20191028/org-git-link.el
diff --git a/elpa/org-plus-contrib-20190930/org-gnus.el b/elpa/org-plus-contrib-20191028/org-gnus.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-gnus.el
rename to elpa/org-plus-contrib-20191028/org-gnus.el
diff --git a/elpa/org-plus-contrib-20190930/org-goto.el b/elpa/org-plus-contrib-20191028/org-goto.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-goto.el
rename to elpa/org-plus-contrib-20191028/org-goto.el
diff --git a/elpa/org-plus-contrib-20190930/org-habit.el b/elpa/org-plus-contrib-20191028/org-habit.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-habit.el
rename to elpa/org-plus-contrib-20191028/org-habit.el
diff --git a/elpa/org-plus-contrib-20190930/org-id.el b/elpa/org-plus-contrib-20191028/org-id.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-id.el
rename to elpa/org-plus-contrib-20191028/org-id.el
diff --git a/elpa/org-plus-contrib-20190930/org-indent.el b/elpa/org-plus-contrib-20191028/org-indent.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-indent.el
rename to elpa/org-plus-contrib-20191028/org-indent.el
diff --git a/elpa/org-plus-contrib-20190930/org-info.el b/elpa/org-plus-contrib-20191028/org-info.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-info.el
rename to elpa/org-plus-contrib-20191028/org-info.el
diff --git a/elpa/org-plus-contrib-20190930/org-inlinetask.el b/elpa/org-plus-contrib-20191028/org-inlinetask.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-inlinetask.el
rename to elpa/org-plus-contrib-20191028/org-inlinetask.el
diff --git a/elpa/org-plus-contrib-20190930/org-install.el b/elpa/org-plus-contrib-20191028/org-install.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-install.el
rename to elpa/org-plus-contrib-20191028/org-install.el
diff --git a/elpa/org-plus-contrib-20190930/org-interactive-query.el b/elpa/org-plus-contrib-20191028/org-interactive-query.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-interactive-query.el
rename to elpa/org-plus-contrib-20191028/org-interactive-query.el
diff --git a/elpa/org-plus-contrib-20190930/org-invoice.el b/elpa/org-plus-contrib-20191028/org-invoice.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-invoice.el
rename to elpa/org-plus-contrib-20191028/org-invoice.el
diff --git a/elpa/org-plus-contrib-20190930/org-irc.el b/elpa/org-plus-contrib-20191028/org-irc.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-irc.el
rename to elpa/org-plus-contrib-20191028/org-irc.el
diff --git a/elpa/org-plus-contrib-20190930/org-learn.el b/elpa/org-plus-contrib-20191028/org-learn.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-learn.el
rename to elpa/org-plus-contrib-20191028/org-learn.el
diff --git a/elpa/org-plus-contrib-20190930/org-license.el b/elpa/org-plus-contrib-20191028/org-license.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-license.el
rename to elpa/org-plus-contrib-20191028/org-license.el
diff --git a/elpa/org-plus-contrib-20190930/org-link-edit.el b/elpa/org-plus-contrib-20191028/org-link-edit.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-link-edit.el
rename to elpa/org-plus-contrib-20191028/org-link-edit.el
diff --git a/elpa/org-plus-contrib-20190930/org-lint.el b/elpa/org-plus-contrib-20191028/org-lint.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-lint.el
rename to elpa/org-plus-contrib-20191028/org-lint.el
diff --git a/elpa/org-plus-contrib-20190930/org-list.el b/elpa/org-plus-contrib-20191028/org-list.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-list.el
rename to elpa/org-plus-contrib-20191028/org-list.el
diff --git a/elpa/org-plus-contrib-20190930/org-loaddefs.el b/elpa/org-plus-contrib-20191028/org-loaddefs.el
similarity index 98%
rename from elpa/org-plus-contrib-20190930/org-loaddefs.el
rename to elpa/org-plus-contrib-20191028/org-loaddefs.el
index a2b935a7..d4e5aac6 100644
--- a/elpa/org-plus-contrib-20190930/org-loaddefs.el
+++ b/elpa/org-plus-contrib-20191028/org-loaddefs.el
@@ -132,7 +132,7 @@ if ARG is `toggle'; disable the mode otherwise.
 
 ;;;***
 
-;;;### (autoloads nil "ob-core" "ob-core.el" (0 0 0 0))
+;;;### (autoloads nil "ob-core" "ob-core.el" "87f73d5013f14a433b1c853819ea720e")
 ;;; Generated autoloads from ob-core.el
 
 (autoload 'org-babel-execute-safely-maybe "ob-core" "\
@@ -364,8 +364,6 @@ Mark current source block.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-core" '("org-")))
-
 ;;;***
 
 ;;;### (autoloads nil "ob-csharp" "ob-csharp.el" (0 0 0 0))
@@ -508,7 +506,7 @@ Mark current source block.
 
 ;;;***
 
-;;;### (autoloads nil "ob-keys" "ob-keys.el" (0 0 0 0))
+;;;### (autoloads nil "ob-keys" "ob-keys.el" "11cd5f8e17581b5dd5e8d3f199ad620d")
 ;;; Generated autoloads from ob-keys.el
 
 (autoload 'org-babel-describe-bindings "ob-keys" "\
@@ -516,8 +514,6 @@ Describe all keybindings behind `org-babel-key-prefix'.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-keys" '("org-babel-")))
-
 ;;;***
 
 ;;;### (autoloads nil "ob-latex" "ob-latex.el" (0 0 0 0))
@@ -548,7 +544,7 @@ Describe all keybindings behind `org-babel-key-prefix'.
 
 ;;;***
 
-;;;### (autoloads nil "ob-lob" "ob-lob.el" (0 0 0 0))
+;;;### (autoloads nil "ob-lob" "ob-lob.el" "6727aa97a79646b6da1990eed6bf61e3")
 ;;; Generated autoloads from ob-lob.el
 
 (autoload 'org-babel-lob-execute-maybe "ob-lob" "\
@@ -569,8 +565,6 @@ see.
 
 \(fn &optional DATUM)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lob" '("org-babel-")))
-
 ;;;***
 
 ;;;### (autoloads nil "ob-lua" "ob-lua.el" (0 0 0 0))
@@ -829,7 +823,7 @@ Execute a block of Spice code `BODY' with org-babel and `PARAMS'.
 
 ;;;***
 
-;;;### (autoloads nil "ob-tangle" "ob-tangle.el" (0 0 0 0))
+;;;### (autoloads nil "ob-tangle" "ob-tangle.el" "82fc18eb309529449fdc9b62a6acdedb")
 ;;; Generated autoloads from ob-tangle.el
 
 (autoload 'org-babel-tangle-file "ob-tangle" "\
@@ -855,8 +849,6 @@ used to limit the exported source code blocks by language.
 
 \(fn &optional ARG TARGET-FILE LANG)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-tangle" '("org-babel-")))
-
 ;;;***
 
 ;;;### (autoloads nil "ob-tcl" "ob-tcl.el" (0 0 0 0))
@@ -1180,7 +1172,7 @@ The annotation will link to ANNOTATED-BUFFER if specified,
 
 ;;;***
 
-;;;### (autoloads nil "org-archive" "org-archive.el" (0 0 0 0))
+;;;### (autoloads nil "org-archive" "org-archive.el" "a05928aac4856608117e562dec97e234")
 ;;; Generated autoloads from org-archive.el
 
 (autoload 'org-add-archive-files "org-archive" "\
@@ -1238,8 +1230,6 @@ This command is set with the variable `org-archive-default-command'.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-archive" '("org-a")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-attach" "org-attach.el" "3b5c015d85e41fc877981506897ab7e5")
@@ -1295,7 +1285,7 @@ Idea taken from `gnus-dired-attach'.
 
 ;;;***
 
-;;;### (autoloads nil "org-bbdb" "org-bbdb.el" (0 0 0 0))
+;;;### (autoloads nil "org-bbdb" "org-bbdb.el" "0b09ebf1301e91f5dcf98ab339378255")
 ;;; Generated autoloads from org-bbdb.el
 
 (autoload 'org-bbdb-anniversaries "org-bbdb" "\
@@ -1303,8 +1293,6 @@ Extract anniversaries from BBDB for display in the agenda.
 
 \(fn)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-bbdb" '("org-bbdb-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-bibtex-extras" "org-bibtex-extras.el"
@@ -1391,7 +1379,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'.
 
 ;;;***
 
-;;;### (autoloads nil "org-clock" "org-clock.el" (0 0 0 0))
+;;;### (autoloads nil "org-clock" "org-clock.el" "09e036675a771d7f456be4c9cfd7ace1")
 ;;; Generated autoloads from org-clock.el
 
 (autoload 'org-resolve-clocks "org-clock" "\
@@ -1544,8 +1532,6 @@ Otherwise, return nil.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-clock" '("org-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-collector" "org-collector.el" (0 0 0 0))
@@ -1693,7 +1679,7 @@ Create agenda view for contacts matching NAME.
 
 ;;;***
 
-;;;### (autoloads nil "org-datetree" "org-datetree.el" (0 0 0 0))
+;;;### (autoloads nil "org-datetree" "org-datetree.el" "774ad6e1857fe8931bc781835a24a290")
 ;;; Generated autoloads from org-datetree.el
 
 (autoload 'org-datetree-find-date-create "org-datetree" "\
@@ -1715,8 +1701,6 @@ will be built under the headline at point.
 
 \(fn D &optional KEEP-RESTRICTION)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-datetree" '("org-datetree-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-depend" "org-depend.el" (0 0 0 0))
@@ -1818,7 +1802,7 @@ Set up org-eldoc documentation function.
 
 ;;;***
 
-;;;### (autoloads nil "org-element" "org-element.el" (0 0 0 0))
+;;;### (autoloads nil "org-element" "org-element.el" "8eae44e6e665b0f8351a629596de0f23")
 ;;; Generated autoloads from org-element.el
 
 (autoload 'org-element-update-syntax "org-element" "\
@@ -1888,8 +1872,6 @@ Providing it allows for quicker computation.
 
 \(fn &optional ELEMENT)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-element" '("org-element-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-elisp-symbol" "org-elisp-symbol.el" (0
@@ -1950,7 +1932,7 @@ Providing it allows for quicker computation.
 
 ;;;***
 
-;;;### (autoloads nil "org-feed" "org-feed.el" (0 0 0 0))
+;;;### (autoloads nil "org-feed" "org-feed.el" "09d3f3b37609f33ffa8ab4674b169e5d")
 ;;; Generated autoloads from org-feed.el
 
 (autoload 'org-feed-update-all "org-feed" "\
@@ -1975,11 +1957,9 @@ Show the raw feed buffer of a feed.
 
 \(fn FEED)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-feed" '("org-feed-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-footnote" "org-footnote.el" (0 0 0 0))
+;;;### (autoloads nil "org-footnote" "org-footnote.el" "b41d3db2b6aa12632b8bdeafb28990e6")
 ;;; Generated autoloads from org-footnote.el
 
 (autoload 'org-footnote-action "org-footnote" "\
@@ -1998,8 +1978,6 @@ offer additional commands in a menu.
 
 \(fn &optional SPECIAL)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-footnote" '("org-footnote-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-git-link" "org-git-link.el" (0 0 0 0))
@@ -2059,7 +2037,7 @@ With a prefix argument, use the alternative interface: e.g., if
 
 ;;;***
 
-;;;### (autoloads nil "org-id" "org-id.el" (0 0 0 0))
+;;;### (autoloads nil "org-id" "org-id.el" "74449482184943877eb07f3d613161b0")
 ;;; Generated autoloads from org-id.el
 
 (autoload 'org-id-get-create "org-id" "\
@@ -2149,21 +2127,14 @@ Store a link to the current entry, using its ID.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-id" '("org-id-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-indent" "org-indent.el" (0 0 0 0))
+;;;### (autoloads nil "org-indent" "org-indent.el" "65830b3f864eb27e88fb85cea5eb1530")
 ;;; Generated autoloads from org-indent.el
 
 (autoload 'org-indent-mode "org-indent" "\
 When active, indent text according to outline structure.
 
-If called interactively, enable Org-Indent mode if ARG is positive, and
-disable it if ARG is zero or negative.  If called from Lisp,
-also enable the mode if ARG is omitted or nil, and toggle it
-if ARG is `toggle'; disable the mode otherwise.
-
 Internally this works by adding `line-prefix' and `wrap-prefix'
 properties, after each buffer modification, on the modified zone.
 
@@ -2173,8 +2144,6 @@ during idle time.
 
 \(fn &optional ARG)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-indent" '("org-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-info" "org-info.el" (0 0 0 0))
@@ -2207,7 +2176,7 @@ during idle time.
 
 ;;;***
 
-;;;### (autoloads nil "org-irc" "org-irc.el" (0 0 0 0))
+;;;### (autoloads nil "org-irc" "org-irc.el" "9388cd8fe8782551d200da0772c56a00")
 ;;; Generated autoloads from org-irc.el
 
 (autoload 'org-irc-store-link "org-irc" "\
@@ -2215,8 +2184,6 @@ Dispatch to the appropriate function to store a link to an IRC session.
 
 \(fn)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-irc" '("org-irc-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-learn" "org-learn.el" (0 0 0 0))
@@ -3944,7 +3911,7 @@ Call the customize function with org as argument.
 
 ;;;***
 
-;;;### (autoloads nil "ox" "ox.el" "9c5401ffd412922a5c0d1912ea6687fe")
+;;;### (autoloads nil "ox" "ox.el" "5c180fcee4218ffa29d079c74fe98a1e")
 ;;; Generated autoloads from ox.el
 
 (autoload 'org-export-get-backend "ox" "\
diff --git a/elpa/org-plus-contrib-20190930/org-mac-iCal.el b/elpa/org-plus-contrib-20191028/org-mac-iCal.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-mac-iCal.el
rename to elpa/org-plus-contrib-20191028/org-mac-iCal.el
diff --git a/elpa/org-plus-contrib-20190930/org-mac-link.el b/elpa/org-plus-contrib-20191028/org-mac-link.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-mac-link.el
rename to elpa/org-plus-contrib-20191028/org-mac-link.el
diff --git a/elpa/org-plus-contrib-20190930/org-macro.el b/elpa/org-plus-contrib-20191028/org-macro.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-macro.el
rename to elpa/org-plus-contrib-20191028/org-macro.el
diff --git a/elpa/org-plus-contrib-20190930/org-macs.el b/elpa/org-plus-contrib-20191028/org-macs.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-macs.el
rename to elpa/org-plus-contrib-20191028/org-macs.el
diff --git a/elpa/org-plus-contrib-20190930/org-mairix.el b/elpa/org-plus-contrib-20191028/org-mairix.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-mairix.el
rename to elpa/org-plus-contrib-20191028/org-mairix.el
diff --git a/elpa/org-plus-contrib-20190930/org-man.el b/elpa/org-plus-contrib-20191028/org-man.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-man.el
rename to elpa/org-plus-contrib-20191028/org-man.el
diff --git a/elpa/org-plus-contrib-20190930/org-mew.el b/elpa/org-plus-contrib-20191028/org-mew.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-mew.el
rename to elpa/org-plus-contrib-20191028/org-mew.el
diff --git a/elpa/org-plus-contrib-20190930/org-mhe.el b/elpa/org-plus-contrib-20191028/org-mhe.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-mhe.el
rename to elpa/org-plus-contrib-20191028/org-mhe.el
diff --git a/elpa/org-plus-contrib-20190930/org-mobile.el b/elpa/org-plus-contrib-20191028/org-mobile.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-mobile.el
rename to elpa/org-plus-contrib-20191028/org-mobile.el
diff --git a/elpa/org-plus-contrib-20190930/org-mouse.el b/elpa/org-plus-contrib-20191028/org-mouse.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-mouse.el
rename to elpa/org-plus-contrib-20191028/org-mouse.el
diff --git a/elpa/org-plus-contrib-20190930/org-notify.el b/elpa/org-plus-contrib-20191028/org-notify.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-notify.el
rename to elpa/org-plus-contrib-20191028/org-notify.el
diff --git a/elpa/org-plus-contrib-20190930/org-notmuch.el b/elpa/org-plus-contrib-20191028/org-notmuch.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-notmuch.el
rename to elpa/org-plus-contrib-20191028/org-notmuch.el
diff --git a/elpa/org-plus-contrib-20190930/org-panel.el b/elpa/org-plus-contrib-20191028/org-panel.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-panel.el
rename to elpa/org-plus-contrib-20191028/org-panel.el
diff --git a/elpa/org-plus-contrib-20190930/org-passwords.el b/elpa/org-plus-contrib-20191028/org-passwords.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-passwords.el
rename to elpa/org-plus-contrib-20191028/org-passwords.el
diff --git a/elpa/org-plus-contrib-20190930/org-pcomplete.el b/elpa/org-plus-contrib-20191028/org-pcomplete.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-pcomplete.el
rename to elpa/org-plus-contrib-20191028/org-pcomplete.el
diff --git a/elpa/org-plus-contrib-20190930/org-plot.el b/elpa/org-plus-contrib-20191028/org-plot.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-plot.el
rename to elpa/org-plus-contrib-20191028/org-plot.el
diff --git a/elpa/org-plus-contrib-20190930/org-plus-contrib-autoloads.el b/elpa/org-plus-contrib-20191028/org-plus-contrib-autoloads.el
similarity index 56%
rename from elpa/org-plus-contrib-20190930/org-plus-contrib-autoloads.el
rename to elpa/org-plus-contrib-20191028/org-plus-contrib-autoloads.el
index 94441020..ed803a9b 100644
--- a/elpa/org-plus-contrib-20190930/org-plus-contrib-autoloads.el
+++ b/elpa/org-plus-contrib-20191028/org-plus-contrib-autoloads.el
@@ -1,40 +1,10 @@
 ;;; org-plus-contrib-autoloads.el --- automatically extracted autoloads
 ;;
 ;;; Code:
-
-(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))
-
-
-;;;### (autoloads nil "ob-C" "ob-C.el" (0 0 0 0))
-;;; Generated autoloads from ob-C.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-C" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-J" "ob-J.el" (0 0 0 0))
-;;; Generated autoloads from ob-J.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-J" '("obj-" "org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-R" "ob-R.el" (0 0 0 0))
-;;; Generated autoloads from ob-R.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-R" '("ob-R-" "org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-abc" "ob-abc.el" (0 0 0 0))
-;;; Generated autoloads from ob-abc.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-abc" '("org-babel-")))
-
-;;;***
+(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
 
-;;;### (autoloads nil "ob-arduino" "ob-arduino.el" (0 0 0 0))
+;;;### (autoloads nil "ob-arduino" "ob-arduino.el" (23994 46414 506006
+;;;;;;  935000))
 ;;; Generated autoloads from ob-arduino.el
 
 (autoload 'org-babel-execute:arduino "ob-arduino" "\
@@ -44,40 +14,10 @@ org-babel arduino hook.
 
 (eval-after-load 'org '(add-to-list 'org-src-lang-modes '("arduino" . arduino)))
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-arduino" '("ob-arduino:" "org-babel-default-header-args:sclang")))
-
-;;;***
-
-;;;### (autoloads nil "ob-asymptote" "ob-asymptote.el" (0 0 0 0))
-;;; Generated autoloads from ob-asymptote.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-asymptote" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-awk" "ob-awk.el" (0 0 0 0))
-;;; Generated autoloads from ob-awk.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-awk" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-calc" "ob-calc.el" (0 0 0 0))
-;;; Generated autoloads from ob-calc.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-calc" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-clojure" "ob-clojure.el" (0 0 0 0))
-;;; Generated autoloads from ob-clojure.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-clojure" '("org-babel-")))
-
 ;;;***
 
 ;;;### (autoloads nil "ob-clojure-literate" "ob-clojure-literate.el"
-;;;;;;  (0 0 0 0))
+;;;;;;  (23994 46414 510103 175000))
 ;;; Generated autoloads from ob-clojure-literate.el
 
 (defvar ob-clojure-literate-auto-jackin-p nil "\
@@ -113,271 +53,9 @@ A minor mode to toggle `ob-clojure-literate'.
 
 \(fn &optional ARG)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-clojure-literate" '("org-babel-" "ob-clojure-literate-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-comint" "ob-comint.el" (0 0 0 0))
-;;; Generated autoloads from ob-comint.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-comint" '("org-babel-comint-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-coq" "ob-coq.el" (0 0 0 0))
-;;; Generated autoloads from ob-coq.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-coq" '("org-babel-" "coq-program-name")))
-
-;;;***
-
-;;;### (autoloads nil "ob-csharp" "ob-csharp.el" (0 0 0 0))
-;;; Generated autoloads from ob-csharp.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-csharp" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-css" "ob-css.el" (0 0 0 0))
-;;; Generated autoloads from ob-css.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-css" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-ditaa" "ob-ditaa.el" (0 0 0 0))
-;;; Generated autoloads from ob-ditaa.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ditaa" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-dot" "ob-dot.el" (0 0 0 0))
-;;; Generated autoloads from ob-dot.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-dot" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-ebnf" "ob-ebnf.el" (0 0 0 0))
-;;; Generated autoloads from ob-ebnf.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ebnf" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-emacs-lisp" "ob-emacs-lisp.el" (0 0 0 0))
-;;; Generated autoloads from ob-emacs-lisp.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-emacs-lisp" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-eukleides" "ob-eukleides.el" (0 0 0 0))
-;;; Generated autoloads from ob-eukleides.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-eukleides" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-eval" "ob-eval.el" (0 0 0 0))
-;;; Generated autoloads from ob-eval.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-eval" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-exp" "ob-exp.el" (0 0 0 0))
-;;; Generated autoloads from ob-exp.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-exp" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-fomus" "ob-fomus.el" (0 0 0 0))
-;;; Generated autoloads from ob-fomus.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-fomus" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-forth" "ob-forth.el" (0 0 0 0))
-;;; Generated autoloads from ob-forth.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-forth" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-fortran" "ob-fortran.el" (0 0 0 0))
-;;; Generated autoloads from ob-fortran.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-fortran" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-gnuplot" "ob-gnuplot.el" (0 0 0 0))
-;;; Generated autoloads from ob-gnuplot.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-gnuplot" '("org-babel-" "*org-babel-gnuplot-")))
-
 ;;;***
 
-;;;### (autoloads nil "ob-groovy" "ob-groovy.el" (0 0 0 0))
-;;; Generated autoloads from ob-groovy.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-groovy" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-haskell" "ob-haskell.el" (0 0 0 0))
-;;; Generated autoloads from ob-haskell.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-haskell" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-hledger" "ob-hledger.el" (0 0 0 0))
-;;; Generated autoloads from ob-hledger.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-hledger" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-io" "ob-io.el" (0 0 0 0))
-;;; Generated autoloads from ob-io.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-io" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-java" "ob-java.el" (0 0 0 0))
-;;; Generated autoloads from ob-java.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-java" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-js" "ob-js.el" (0 0 0 0))
-;;; Generated autoloads from ob-js.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-js" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-julia" "ob-julia.el" (0 0 0 0))
-;;; Generated autoloads from ob-julia.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-julia" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-latex" "ob-latex.el" (0 0 0 0))
-;;; Generated autoloads from ob-latex.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-latex" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-ledger" "ob-ledger.el" (0 0 0 0))
-;;; Generated autoloads from ob-ledger.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ledger" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-lilypond" "ob-lilypond.el" (0 0 0 0))
-;;; Generated autoloads from ob-lilypond.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lilypond" '("org-babel-" "lilypond-mode")))
-
-;;;***
-
-;;;### (autoloads nil "ob-lisp" "ob-lisp.el" (0 0 0 0))
-;;; Generated autoloads from ob-lisp.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lisp" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-lua" "ob-lua.el" (0 0 0 0))
-;;; Generated autoloads from ob-lua.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-lua" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-makefile" "ob-makefile.el" (0 0 0 0))
-;;; Generated autoloads from ob-makefile.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-makefile" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-mathematica" "ob-mathematica.el" (0 0 0
-;;;;;;  0))
-;;; Generated autoloads from ob-mathematica.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-mathematica" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-mathomatic" "ob-mathomatic.el" (0 0 0 0))
-;;; Generated autoloads from ob-mathomatic.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-mathomatic" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-maxima" "ob-maxima.el" (0 0 0 0))
-;;; Generated autoloads from ob-maxima.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-maxima" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-mscgen" "ob-mscgen.el" (0 0 0 0))
-;;; Generated autoloads from ob-mscgen.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-mscgen" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-ocaml" "ob-ocaml.el" (0 0 0 0))
-;;; Generated autoloads from ob-ocaml.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ocaml" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-octave" "ob-octave.el" (0 0 0 0))
-;;; Generated autoloads from ob-octave.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-octave" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-org" "ob-org.el" (0 0 0 0))
-;;; Generated autoloads from ob-org.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-org" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-oz" "ob-oz.el" (0 0 0 0))
-;;; Generated autoloads from ob-oz.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-oz" '("oz-send-string-expression" "org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-perl" "ob-perl.el" (0 0 0 0))
-;;; Generated autoloads from ob-perl.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-perl" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-php" "ob-php.el" (0 0 0 0))
+;;;### (autoloads nil "ob-php" "ob-php.el" (23994 46414 553031 448000))
 ;;; Generated autoloads from ob-php.el
 
 (autoload 'org-babel-execute:php "ob-php" "\
@@ -387,39 +65,10 @@ Orgmode Babel PHP evaluate function for `BODY' with `PARAMS'.
 
 (eval-after-load "org" '(add-to-list 'org-src-lang-modes '("php" . php)))
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-php" '("ob-php:inf-php-buffer" "org-babel-default-header-args:php")))
-
-;;;***
-
-;;;### (autoloads nil "ob-picolisp" "ob-picolisp.el" (0 0 0 0))
-;;; Generated autoloads from ob-picolisp.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-picolisp" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-plantuml" "ob-plantuml.el" (0 0 0 0))
-;;; Generated autoloads from ob-plantuml.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-plantuml" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-processing" "ob-processing.el" (0 0 0 0))
-;;; Generated autoloads from ob-processing.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-processing" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-python" "ob-python.el" (0 0 0 0))
-;;; Generated autoloads from ob-python.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-python" '("org-babel-")))
-
 ;;;***
 
-;;;### (autoloads nil "ob-redis" "ob-redis.el" (0 0 0 0))
+;;;### (autoloads nil "ob-redis" "ob-redis.el" (23994 46414 558078
+;;;;;;  179000))
 ;;; Generated autoloads from ob-redis.el
 
 (autoload 'org-babel-execute:redis "ob-redis" "\
@@ -429,39 +78,10 @@ org-babel redis hook.
 
 (eval-after-load "org" '(add-to-list 'org-src-lang-modes '("redis" . redis)))
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-redis" '("ob-redis:default-db")))
-
-;;;***
-
-;;;### (autoloads nil "ob-ref" "ob-ref.el" (0 0 0 0))
-;;; Generated autoloads from ob-ref.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ref" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-ruby" "ob-ruby.el" (0 0 0 0))
-;;; Generated autoloads from ob-ruby.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-ruby" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-sass" "ob-sass.el" (0 0 0 0))
-;;; Generated autoloads from ob-sass.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sass" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-scheme" "ob-scheme.el" (0 0 0 0))
-;;; Generated autoloads from ob-scheme.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-scheme" '("org-babel-")))
-
 ;;;***
 
-;;;### (autoloads nil "ob-sclang" "ob-sclang.el" (0 0 0 0))
+;;;### (autoloads nil "ob-sclang" "ob-sclang.el" (23994 46414 563106
+;;;;;;  695000))
 ;;; Generated autoloads from ob-sclang.el
 
 (autoload 'org-babel-execute:sclang "ob-sclang" "\
@@ -469,46 +89,10 @@ Org-mode Babel sclang hook for evaluate `BODY' with `PARAMS'.
 
 \(fn BODY PARAMS)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sclang" '("org-babel-default-header-args:sclang")))
-
-;;;***
-
-;;;### (autoloads nil "ob-screen" "ob-screen.el" (0 0 0 0))
-;;; Generated autoloads from ob-screen.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-screen" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-sed" "ob-sed.el" (0 0 0 0))
-;;; Generated autoloads from ob-sed.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sed" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-shell" "ob-shell.el" (0 0 0 0))
-;;; Generated autoloads from ob-shell.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-shell" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-shen" "ob-shen.el" (0 0 0 0))
-;;; Generated autoloads from ob-shen.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-shen" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-smiles" "ob-smiles.el" (0 0 0 0))
-;;; Generated autoloads from ob-smiles.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-smiles" '("molecule-" "org-babel-execute:smiles")))
-
 ;;;***
 
-;;;### (autoloads nil "ob-spice" "ob-spice.el" (0 0 0 0))
+;;;### (autoloads nil "ob-spice" "ob-spice.el" (23994 46414 569551
+;;;;;;  407000))
 ;;; Generated autoloads from ob-spice.el
 
 (autoload 'org-babel-execute:spice "ob-spice" "\
@@ -516,67 +100,9 @@ Execute a block of Spice code `BODY' with org-babel and `PARAMS'.
 
 \(fn BODY PARAMS)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-spice" '("ob-spice-concat" "org-babel-expand-body:spice")))
-
 ;;;***
 
-;;;### (autoloads nil "ob-sql" "ob-sql.el" (0 0 0 0))
-;;; Generated autoloads from ob-sql.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sql" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-sqlite" "ob-sqlite.el" (0 0 0 0))
-;;; Generated autoloads from ob-sqlite.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-sqlite" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-stan" "ob-stan.el" (0 0 0 0))
-;;; Generated autoloads from ob-stan.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-stan" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-stata" "ob-stata.el" (0 0 0 0))
-;;; Generated autoloads from ob-stata.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-stata" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-table" "ob-table.el" (0 0 0 0))
-;;; Generated autoloads from ob-table.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-table" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-tcl" "ob-tcl.el" (0 0 0 0))
-;;; Generated autoloads from ob-tcl.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-tcl" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-vala" "ob-vala.el" (0 0 0 0))
-;;; Generated autoloads from ob-vala.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-vala" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "ob-vbnet" "ob-vbnet.el" (0 0 0 0))
-;;; Generated autoloads from ob-vbnet.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-vbnet" '("org-babel-")))
-
-;;;***
-
-;;;### (autoloads nil "org" "org.el" (0 0 0 0))
+;;;### (autoloads nil "org" "org.el" (23994 46414 677970 260000))
 ;;; Generated autoloads from org.el
 
 (autoload 'org-babel-do-load-languages "org" "\
@@ -780,11 +306,10 @@ Call the customize function with org as argument.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org" '("org-" "turn-on-org-cdlatex")))
-
 ;;;***
 
-;;;### (autoloads nil "org-agenda" "org-agenda.el" (0 0 0 0))
+;;;### (autoloads nil "org-agenda" "org-agenda.el" (23994 46414 580799
+;;;;;;  951000))
 ;;; Generated autoloads from org-agenda.el
 
 (autoload 'org-toggle-sticky-agenda "org-agenda" "\
@@ -1058,12 +583,10 @@ to override `appt-message-warning-time'.
 
 \(fn &optional REFRESH FILTER &rest ARGS)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-agenda" '("org-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-annotate-file" "org-annotate-file.el"
-;;;;;;  (0 0 0 0))
+;;;;;;  (23994 46414 582799 194000))
 ;;; Generated autoloads from org-annotate-file.el
 
 (autoload 'org-annotate-file "org-annotate-file" "\
@@ -1080,20 +603,10 @@ The annotation will link to ANNOTATED-BUFFER if specified,
 
 \(fn STORAGE-FILE &optional ANNOTATED-BUFFER)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-annotate-file" '("org-annotate-file-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "org-attach" "org-attach.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-attach.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-attach" '("org-attach-")))
-
 ;;;***
 
 ;;;### (autoloads nil "org-attach-embedded-images" "org-attach-embedded-images.el"
-;;;;;;  (0 0 0 0))
+;;;;;;  (23994 46414 584897 863000))
 ;;; Generated autoloads from org-attach-embedded-images.el
 
 (autoload 'org-attach-embedded-images-in-subtree "org-attach-embedded-images" "\
@@ -1101,33 +614,10 @@ Save the displayed images as attachments and insert links to them.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-attach-embedded-images" '("org-attach-embedded-images--")))
-
-;;;***
-
-;;;### (autoloads nil "org-bibtex" "org-bibtex.el" (0 0 0 0))
-;;; Generated autoloads from org-bibtex.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-bibtex" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-bibtex-extras" "org-bibtex-extras.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-bibtex-extras.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-bibtex-extras" '("obe-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-bookmark" "org-bookmark.el" (0 0 0 0))
-;;; Generated autoloads from org-bookmark.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-bookmark" '("org-bookmark-")))
-
-;;;***
-
-;;;### (autoloads nil "org-capture" "org-capture.el" (0 0 0 0))
+;;;### (autoloads nil "org-capture" "org-capture.el" (23994 46414
+;;;;;;  590694 760000))
 ;;; Generated autoloads from org-capture.el
 
 (autoload 'org-capture-string "org-capture" "\
@@ -1171,32 +661,10 @@ Set `org-capture-templates' to be similar to `org-remember-templates'.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-capture" '("org-capture-")))
-
-;;;***
-
-;;;### (autoloads nil "org-checklist" "org-checklist.el" (0 0 0 0))
-;;; Generated autoloads from org-checklist.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-checklist" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-choose" "org-choose.el" (0 0 0 0))
-;;; Generated autoloads from org-choose.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-choose" '("org-choose-")))
-
-;;;***
-
-;;;### (autoloads nil "org-collector" "org-collector.el" (0 0 0 0))
-;;; Generated autoloads from org-collector.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-collector" '("org-" "and-rest")))
-
 ;;;***
 
-;;;### (autoloads nil "org-colview" "org-colview.el" (0 0 0 0))
+;;;### (autoloads nil "org-colview" "org-colview.el" (23994 46414
+;;;;;;  596277 770000))
 ;;; Generated autoloads from org-colview.el
 
 (autoload 'org-columns-remove-overlays "org-colview" "\
@@ -1292,11 +760,10 @@ Turn on or update column view in the agenda.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-colview" '("org-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-compat" "org-compat.el" (0 0 0 0))
+;;;### (autoloads nil "org-compat" "org-compat.el" (23994 46414 597275
+;;;;;;  185000))
 ;;; Generated autoloads from org-compat.el
 
 (autoload 'org-check-version "org-compat" "\
@@ -1304,11 +771,10 @@ Try very hard to provide sensible version strings.
 
 \(fn)" nil t)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-compat" '("org-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-contacts" "org-contacts.el" (0 0 0 0))
+;;;### (autoloads nil "org-contacts" "org-contacts.el" (23994 46414
+;;;;;;  598293 741000))
 ;;; Generated autoloads from org-contacts.el
 
 (autoload 'org-contacts "org-contacts" "\
@@ -1316,46 +782,10 @@ Create agenda view for contacts matching NAME.
 
 \(fn NAME)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-contacts" '("org-co" "erc-nicknames-list")))
-
-;;;***
-
-;;;### (autoloads nil "org-crypt" "org-crypt.el" (0 0 0 0))
-;;; Generated autoloads from org-crypt.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-crypt" '("org-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-ctags" "org-ctags.el" (0 0 0 0))
-;;; Generated autoloads from org-ctags.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-ctags" '("org-ctags-")))
-
-;;;***
-
-;;;### (autoloads nil "org-depend" "org-depend.el" (0 0 0 0))
-;;; Generated autoloads from org-depend.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-depend" '("org-depend-")))
-
-;;;***
-
-;;;### (autoloads nil "org-docview" "org-docview.el" (0 0 0 0))
-;;; Generated autoloads from org-docview.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-docview" '("org-docview-")))
-
-;;;***
-
-;;;### (autoloads nil "org-drill" "org-drill.el" (0 0 0 0))
-;;; Generated autoloads from org-drill.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-drill" '("org-" "shuffle-list" "spelln-integer-in-language" "*org-drill-" "with-" "drill-answer" "determine-next-interval-s" "initial-optimal-factor-sm5" "inter-repetition-interval-sm5" "get-optimal-factor-sm5" "pop-random" "push-end" "pseudonormal" "time-to-" "command-keybinding-to-string" "round-float" "free-marker")))
-
-;;;***
-
-;;;### (autoloads nil "org-duration" "org-duration.el" (0 0 0 0))
+;;;### (autoloads nil "org-duration" "org-duration.el" (23994 46414
+;;;;;;  606529 863000))
 ;;; Generated autoloads from org-duration.el
 
 (autoload 'org-duration-set-regexps "org-duration" "\
@@ -1391,121 +821,39 @@ non-nil.
 When optional argument CANONICAL is non-nil, ignore
 `org-duration-units' and use standard time units value.
 
-Raise an error if expected format is unknown.
-
-\(fn MINUTES &optional FMT CANONICAL)" nil nil)
-
-(autoload 'org-duration-h:mm-only-p "org-duration" "\
-Non-nil when every duration in TIMES has \"H:MM\" or \"H:MM:SS\" format.
-
-TIMES is a list of duration strings.
-
-Return nil if any duration is expressed with units, as defined in
-`org-duration-units'.  Otherwise, if any duration is expressed
-with \"H:MM:SS\" format, return `h:mm:ss'.  Otherwise, return
-`h:mm'.
-
-\(fn TIMES)" nil nil)
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-duration" '("org-duration-")))
-
-;;;***
-
-;;;### (autoloads nil "org-effectiveness" "org-effectiveness.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-effectiveness.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-effectiveness" '("org-effectiveness-")))
-
-;;;***
-
-;;;### (autoloads nil "org-eldoc" "org-eldoc.el" (0 0 0 0))
-;;; Generated autoloads from org-eldoc.el
-
-(autoload 'org-eldoc-load "org-eldoc" "\
-Set up org-eldoc documentation function.
-
-\(fn)" t nil)
-
-(add-hook 'org-mode-hook #'org-eldoc-load)
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-eldoc" '("org-eldoc-")))
-
-;;;***
-
-;;;### (autoloads nil "org-elisp-symbol" "org-elisp-symbol.el" (0
-;;;;;;  0 0 0))
-;;; Generated autoloads from org-elisp-symbol.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-elisp-symbol" '("org-elisp-symbol-")))
-
-;;;***
-
-;;;### (autoloads nil "org-entities" "org-entities.el" (0 0 0 0))
-;;; Generated autoloads from org-entities.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-entities" '("org-entit")))
-
-;;;***
-
-;;;### (autoloads nil "org-eshell" "org-eshell.el" (0 0 0 0))
-;;; Generated autoloads from org-eshell.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-eshell" '("org-eshell-")))
-
-;;;***
-
-;;;### (autoloads nil "org-eval" "org-eval.el" (0 0 0 0))
-;;; Generated autoloads from org-eval.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-eval" '("org-eval-")))
-
-;;;***
-
-;;;### (autoloads nil "org-eval-light" "org-eval-light.el" (0 0 0
-;;;;;;  0))
-;;; Generated autoloads from org-eval-light.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-eval-light" '("org-eval-light-")))
-
-;;;***
-
-;;;### (autoloads nil "org-eww" "org-eww.el" (0 0 0 0))
-;;; Generated autoloads from org-eww.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-eww" '("org-eww-")))
+Raise an error if expected format is unknown.
 
-;;;***
-
-;;;### (autoloads nil "org-expiry" "org-expiry.el" (0 0 0 0))
-;;; Generated autoloads from org-expiry.el
+\(fn MINUTES &optional FMT CANONICAL)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-expiry" '("org-expiry-")))
+(autoload 'org-duration-h:mm-only-p "org-duration" "\
+Non-nil when every duration in TIMES has \"H:MM\" or \"H:MM:SS\" format.
 
-;;;***
-
-;;;### (autoloads nil "org-faces" "org-faces.el" (0 0 0 0))
-;;; Generated autoloads from org-faces.el
+TIMES is a list of duration strings.
+
+Return nil if any duration is expressed with units, as defined in
+`org-duration-units'.  Otherwise, if any duration is expressed
+with \"H:MM:SS\" format, return `h:mm:ss'.  Otherwise, return
+`h:mm'.
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-faces" '("org-")))
+\(fn TIMES)" nil nil)
 
 ;;;***
 
-;;;### (autoloads nil "org-git-link" "org-git-link.el" (0 0 0 0))
-;;; Generated autoloads from org-git-link.el
+;;;### (autoloads nil "org-eldoc" "org-eldoc.el" (23994 46414 608533
+;;;;;;  203000))
+;;; Generated autoloads from org-eldoc.el
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-git-link" '("org-git")))
+(autoload 'org-eldoc-load "org-eldoc" "\
+Set up org-eldoc documentation function.
 
-;;;***
-
-;;;### (autoloads nil "org-gnus" "org-gnus.el" (0 0 0 0))
-;;; Generated autoloads from org-gnus.el
+\(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-gnus" '("org-gnus-")))
+(add-hook 'org-mode-hook #'org-eldoc-load)
 
 ;;;***
 
-;;;### (autoloads nil "org-goto" "org-goto.el" (0 0 0 0))
+;;;### (autoloads nil "org-goto" "org-goto.el" (23994 46414 622974
+;;;;;;  439000))
 ;;; Generated autoloads from org-goto.el
 
 (autoload 'org-goto-location "org-goto" "\
@@ -1537,62 +885,10 @@ With a prefix argument, use the alternative interface: e.g., if
 
 \(fn &optional ALTERNATIVE-INTERFACE)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-goto" '("org-goto-")))
-
-;;;***
-
-;;;### (autoloads nil "org-habit" "org-habit.el" (0 0 0 0))
-;;; Generated autoloads from org-habit.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-habit" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-info" "org-info.el" (0 0 0 0))
-;;; Generated autoloads from org-info.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-info" '("org-info-")))
-
-;;;***
-
-;;;### (autoloads nil "org-inlinetask" "org-inlinetask.el" (0 0 0
-;;;;;;  0))
-;;; Generated autoloads from org-inlinetask.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-inlinetask" '("org-inlinetask-")))
-
-;;;***
-
-;;;### (autoloads nil "org-interactive-query" "org-interactive-query.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-interactive-query.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-interactive-query" '("org-agenda-query-")))
-
-;;;***
-
-;;;### (autoloads nil "org-invoice" "org-invoice.el" (0 0 0 0))
-;;; Generated autoloads from org-invoice.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-invoice" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-learn" "org-learn.el" (0 0 0 0))
-;;; Generated autoloads from org-learn.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-learn" '("org-" "determine-next-interval" "inter-repetition-interval" "initial-" "calculate-new-optimal-factor" "modify-" "set-optimal-factor" "get-optimal-factor")))
-
-;;;***
-
-;;;### (autoloads nil "org-license" "org-license.el" (0 0 0 0))
-;;; Generated autoloads from org-license.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-license" '("org-license-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-link-edit" "org-link-edit.el" (0 0 0 0))
+;;;### (autoloads nil "org-link-edit" "org-link-edit.el" (23994 46414
+;;;;;;  636213 678000))
 ;;; Generated autoloads from org-link-edit.el
 
 (autoload 'org-link-edit-forward-slurp "org-link-edit" "\
@@ -1688,11 +984,10 @@ END.
 
 \(fn &optional PREVIOUS BEG END)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-link-edit" '("org-link-edit--")))
-
 ;;;***
 
-;;;### (autoloads nil "org-lint" "org-lint.el" (0 0 0 0))
+;;;### (autoloads nil "org-lint" "org-lint.el" (23994 46414 637153
+;;;;;;  649000))
 ;;; Generated autoloads from org-lint.el
 
 (autoload 'org-lint "org-lint" "\
@@ -1706,25 +1001,10 @@ ARG can also be a list of checker names, as symbols, to run.
 
 \(fn &optional ARG)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-lint" '("org-lint-")))
-
-;;;***
-
-;;;### (autoloads nil "org-list" "org-list.el" (0 0 0 0))
-;;; Generated autoloads from org-list.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-list" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-mac-iCal" "org-mac-iCal.el" (0 0 0 0))
-;;; Generated autoloads from org-mac-iCal.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mac-iCal" '("org-mac-iCal" "omi-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-mac-link" "org-mac-link.el" (0 0 0 0))
+;;;### (autoloads nil "org-mac-link" "org-mac-link.el" (23994 46414
+;;;;;;  642154 637000))
 ;;; Generated autoloads from org-mac-link.el
 
 (autoload 'org-mac-grab-link "org-mac-link" "\
@@ -1899,18 +1179,10 @@ list of message:// links to flagged mail after heading.
 
 \(fn ORG-BUFFER ORG-HEADING)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mac-link" '("org-" "as-get-s")))
-
-;;;***
-
-;;;### (autoloads nil "org-macro" "org-macro.el" (0 0 0 0))
-;;; Generated autoloads from org-macro.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-macro" '("org-macro-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-macs" "org-macs.el" (0 0 0 0))
+;;;### (autoloads nil "org-macs" "org-macs.el" (23994 46414 644228
+;;;;;;  824000))
 ;;; Generated autoloads from org-macs.el
 
 (autoload 'org-load-noerror-mustsuffix "org-macs" "\
@@ -1918,75 +1190,10 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX.
 
 \(fn FILE)" nil t)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-macs" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-mairix" "org-mairix.el" (0 0 0 0))
-;;; Generated autoloads from org-mairix.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mairix" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-man" "org-man.el" (0 0 0 0))
-;;; Generated autoloads from org-man.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-man" '("org-man-")))
-
-;;;***
-
-;;;### (autoloads nil "org-mew" "org-mew.el" (0 0 0 0))
-;;; Generated autoloads from org-mew.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mew" '("org-mew-")))
-
-;;;***
-
-;;;### (autoloads nil "org-mhe" "org-mhe.el" (0 0 0 0))
-;;; Generated autoloads from org-mhe.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mhe" '("org-mhe-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "org-mobile" "org-mobile.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-mobile.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mobile" '("org-mobile-")))
-
-;;;***
-
-;;;### (autoloads nil "org-mouse" "org-mouse.el" (0 0 0 0))
-;;; Generated autoloads from org-mouse.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mouse" '("org-mouse-")))
-
-;;;***
-
-;;;### (autoloads nil "org-notify" "org-notify.el" (0 0 0 0))
-;;; Generated autoloads from org-notify.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-notify" '("org-notify-")))
-
-;;;***
-
-;;;### (autoloads nil "org-notmuch" "org-notmuch.el" (0 0 0 0))
-;;; Generated autoloads from org-notmuch.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-notmuch" '("org-notmuch-")))
-
-;;;***
-
-;;;### (autoloads nil "org-panel" "org-panel.el" (0 0 0 0))
-;;; Generated autoloads from org-panel.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-panel" '("orgpan-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-passwords" "org-passwords.el" (0 0 0 0))
+;;;### (autoloads nil "org-passwords" "org-passwords.el" (23994 46414
+;;;;;;  654025 831000))
 ;;; Generated autoloads from org-passwords.el
 
 (autoload 'org-passwords-mode "org-passwords" "\
@@ -2008,33 +1215,10 @@ With a double prefix arg \\[universal-argument] \\[universal-argument], open the
 
 \(fn &optional ARG)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-passwords" '("org-passwords-")))
-
-;;;***
-
-;;;### (autoloads nil "org-pcomplete" "org-pcomplete.el" (0 0 0 0))
-;;; Generated autoloads from org-pcomplete.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-pcomplete" '("pcomplete/org-mode/" "org-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "org-plot" "org-plot.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-plot.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-plot" '("org-plot")))
-
 ;;;***
 
-;;;### (autoloads nil "org-protocol" "org-protocol.el" (0 0 0 0))
-;;; Generated autoloads from org-protocol.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-protocol" '("org-protocol-")))
-
-;;;***
-
-;;;### (autoloads nil "org-registry" "org-registry.el" (0 0 0 0))
+;;;### (autoloads nil "org-registry" "org-registry.el" (23994 46414
+;;;;;;  658170 87000))
 ;;; Generated autoloads from org-registry.el
 
 (autoload 'org-registry-show "org-registry" "\
@@ -2069,26 +1253,10 @@ Update the registry for the current Org file.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-registry" '("org-registry-")))
-
-;;;***
-
-;;;### (autoloads nil "org-rmail" "org-rmail.el" (0 0 0 0))
-;;; Generated autoloads from org-rmail.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-rmail" '("org-rmail-")))
-
-;;;***
-
-;;;### (autoloads nil "org-screen" "org-screen.el" (0 0 0 0))
-;;; Generated autoloads from org-screen.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-screen" '("org-screen")))
-
 ;;;***
 
-;;;### (autoloads nil "org-screenshot" "org-screenshot.el" (0 0 0
-;;;;;;  0))
+;;;### (autoloads nil "org-screenshot" "org-screenshot.el" (23994
+;;;;;;  46414 661085 788000))
 ;;; Generated autoloads from org-screenshot.el
 
 (autoload 'org-screenshot-take "org-screenshot" "\
@@ -2129,63 +1297,10 @@ Open A Dired buffer with unused screenshots marked
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-screenshot" '("org-screenshot-")))
-
-;;;***
-
-;;;### (autoloads nil "org-secretary" "org-secretary.el" (0 0 0 0))
-;;; Generated autoloads from org-secretary.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-secretary" '("org-sec-" "join")))
-
-;;;***
-
-;;;### (autoloads nil "org-src" "org-src.el" (0 0 0 0))
-;;; Generated autoloads from org-src.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-src" '("org-")))
-
-;;;***
-
-;;;### (autoloads nil "org-static-mathjax" "org-static-mathjax.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-static-mathjax.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-static-mathjax" '("org-static-mathjax-")))
-
-;;;***
-
-;;;### (autoloads nil "org-sudoku" "org-sudoku.el" (0 0 0 0))
-;;; Generated autoloads from org-sudoku.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-sudoku" '("org-sudoku-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "org-table" "org-table.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-table.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-table" '("org")))
-
-;;;***
-
-;;;### (autoloads nil "org-tempo" "org-tempo.el" (0 0 0 0))
-;;; Generated autoloads from org-tempo.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-tempo" '("org-tempo-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "org-timer" "org-timer.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from org-timer.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-timer" '("org-timer-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-toc" "org-toc.el" (0 0 0 0))
+;;;### (autoloads nil "org-toc" "org-toc.el" (23994 46414 669793
+;;;;;;  459000))
 ;;; Generated autoloads from org-toc.el
 
 (autoload 'org-toc-show "org-toc" "\
@@ -2193,11 +1308,10 @@ Show the table of contents of the current Org-mode buffer.
 
 \(fn &optional DEPTH POSITION)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-toc" '("org-")))
-
 ;;;***
 
-;;;### (autoloads nil "org-track" "org-track.el" (0 0 0 0))
+;;;### (autoloads nil "org-track" "org-track.el" (23994 46414 670791
+;;;;;;  341000))
 ;;; Generated autoloads from org-track.el
 
 (autoload 'org-track-fetch-package "org-track" "\
@@ -2216,18 +1330,10 @@ DIRECTORY is where the directory org-mode/ lives (i.e. the
 
 \(fn &optional DIRECTORY)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-track" '("org-track-")))
-
-;;;***
-
-;;;### (autoloads nil "org-velocity" "org-velocity.el" (0 0 0 0))
-;;; Generated autoloads from org-velocity.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-velocity" '("org-velocity")))
-
 ;;;***
 
-;;;### (autoloads nil "org-version" "org-version.el" (0 0 0 0))
+;;;### (autoloads nil "org-version" "org-version.el" (23994 46414
+;;;;;;  672712 190000))
 ;;; Generated autoloads from org-version.el
 
 (autoload 'org-release "org-version" "\
@@ -2247,95 +1353,8 @@ The location of ODT styles.")
 
 ;;;***
 
-;;;### (autoloads nil "org-vm" "org-vm.el" (0 0 0 0))
-;;; Generated autoloads from org-vm.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-vm" '("org-vm-")))
-
-;;;***
-
-;;;### (autoloads nil "org-w3m" "org-w3m.el" (0 0 0 0))
-;;; Generated autoloads from org-w3m.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-w3m" '("org-w3m-")))
-
-;;;***
-
-;;;### (autoloads nil "org-wikinodes" "org-wikinodes.el" (0 0 0 0))
-;;; Generated autoloads from org-wikinodes.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-wikinodes" '("org-wikinodes-")))
-
-;;;***
-
-;;;### (autoloads nil "org-wl" "org-wl.el" (0 0 0 0))
-;;; Generated autoloads from org-wl.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-wl" '("org-wl-")))
-
-;;;***
-
-;;;### (autoloads nil "orgtbl-sqlinsert" "orgtbl-sqlinsert.el" (0
-;;;;;;  0 0 0))
-;;; Generated autoloads from orgtbl-sqlinsert.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "orgtbl-sqlinsert" '("orgtbl-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox" "ox.el" (0
-;;;;;;  0 0 0))
-;;; Generated autoloads from ox.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox" '("org-export-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-ascii" "ox-ascii.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-ascii.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-ascii" '("org-ascii-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-beamer" "ox-beamer.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-beamer.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-beamer" '("org-beamer-")))
-
-;;;***
-
-;;;### (autoloads nil "ox-bibtex" "ox-bibtex.el" (0 0 0 0))
-;;; Generated autoloads from ox-bibtex.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-bibtex" '("org-bibtex-")))
-
-;;;***
-
-;;;### (autoloads nil "ox-confluence" "ox-confluence.el" (0 0 0 0))
-;;; Generated autoloads from ox-confluence.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-confluence" '("org-confluence-")))
-
-;;;***
-
-;;;### (autoloads nil "ox-deck" "ox-deck.el" (0 0 0 0))
-;;; Generated autoloads from ox-deck.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-deck" '("org-deck-")))
-
-;;;***
-
-;;;### (autoloads nil "ox-extra" "ox-extra.el" (0 0 0 0))
-;;; Generated autoloads from ox-extra.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-extra" '("org-" "ox-extras")))
-
-;;;***
-
-;;;### (autoloads nil "ox-freemind" "ox-freemind.el" (0 0 0 0))
+;;;### (autoloads nil "ox-freemind" "ox-freemind.el" (23994 46414
+;;;;;;  687755 234000))
 ;;; Generated autoloads from ox-freemind.el
 
 (autoload 'org-freemind-export-to-freemind "ox-freemind" "\
@@ -2368,35 +1387,10 @@ Return output file's name.
 
 \(fn &optional ASYNC SUBTREEP VISIBLE-ONLY BODY-ONLY EXT-PLIST)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-freemind" '("org-freemind-")))
-
-;;;***
-
-;;;### (autoloads nil "ox-groff" "ox-groff.el" (0 0 0 0))
-;;; Generated autoloads from ox-groff.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-groff" '("org-groff-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-html" "ox-html.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-html.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-html" '("org-html-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-icalendar"
-;;;;;;  "ox-icalendar.el" (0 0 0 0))
-;;; Generated autoloads from ox-icalendar.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-icalendar" '("org-icalendar-")))
-
 ;;;***
 
-;;;### (autoloads nil "ox-koma-letter" "ox-koma-letter.el" (0 0 0
-;;;;;;  0))
+;;;### (autoloads nil "ox-koma-letter" "ox-koma-letter.el" (23994
+;;;;;;  46414 692124 625000))
 ;;; Generated autoloads from ox-koma-letter.el
 
 (autoload 'org-koma-letter-export-as-latex "ox-koma-letter" "\
@@ -2494,59 +1488,9 @@ Return PDF file's name.
 
 \(fn &optional ASYNC SUBTREEP VISIBLE-ONLY BODY-ONLY EXT-PLIST)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-koma-letter" '("org-koma-letter-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-latex" "ox-latex.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-latex.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-latex" '("org-latex-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-man" "ox-man.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-man.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-man" '("org-man-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-md" "ox-md.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-md.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-md" '("org-md-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-odt" "ox-odt.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-odt.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-odt" '("org-odt-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-org" "ox-org.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-org.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-org" '("org-org-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-publish" "ox-publish.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-publish.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-publish" '("org-publish-")))
-
 ;;;***
 
-;;;### (autoloads nil "ox-rss" "ox-rss.el" (0 0 0 0))
+;;;### (autoloads nil "ox-rss" "ox-rss.el" (23994 46414 700016 546000))
 ;;; Generated autoloads from ox-rss.el
 
 (autoload 'org-rss-export-as-rss "ox-rss" "\
@@ -2608,19 +1552,10 @@ Return output file name.
 
 \(fn PLIST FILENAME PUB-DIR)" nil nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-rss" '("org-rss-")))
-
-;;;***
-
-;;;### (autoloads nil "ox-s5" "ox-s5.el" (0 0 0 0))
-;;; Generated autoloads from ox-s5.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-s5" '("org-s5-")))
-
 ;;;***
 
-;;;### (autoloads nil "ox-taskjuggler" "ox-taskjuggler.el" (0 0 0
-;;;;;;  0))
+;;;### (autoloads nil "ox-taskjuggler" "ox-taskjuggler.el" (23994
+;;;;;;  46414 702019 416000))
 ;;; Generated autoloads from ox-taskjuggler.el
 
 (autoload 'org-taskjuggler-export "ox-taskjuggler" "\
@@ -2704,28 +1639,48 @@ the reports is done using the TaskJuggler GUI.
 
 \(fn &optional SUBTREEP VISIBLE-ONLY)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-taskjuggler" '("org-taskjuggler-")))
-
-;;;***
-
-;;;### (autoloads "actual autoloads are elsewhere" "ox-texinfo" "ox-texinfo.el"
-;;;;;;  (0 0 0 0))
-;;; Generated autoloads from ox-texinfo.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-texinfo" '("org-texinfo-")))
-
 ;;;***
 
-;;;### (autoloads nil nil ("ob-core.el" "ob-keys.el" "ob-lob.el"
-;;;;;;  "ob-matlab.el" "ob-tangle.el" "ob.el" "org-archive.el" "org-attach.el"
-;;;;;;  "org-bbdb.el" "org-clock.el" "org-contribdir.el" "org-datetree.el"
-;;;;;;  "org-element.el" "org-feed.el" "org-footnote.el" "org-id.el"
-;;;;;;  "org-indent.el" "org-install.el" "org-irc.el" "org-loaddefs.el"
-;;;;;;  "org-mobile.el" "org-plot.el" "org-plus-contrib-pkg.el" "org-table.el"
-;;;;;;  "org-timer.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") (0 0
-;;;;;;  0 0))
+;;;### (autoloads nil nil ("ob-C.el" "ob-J.el" "ob-R.el" "ob-abc.el"
+;;;;;;  "ob-asymptote.el" "ob-awk.el" "ob-calc.el" "ob-clojure.el"
+;;;;;;  "ob-comint.el" "ob-coq.el" "ob-core.el" "ob-csharp.el" "ob-css.el"
+;;;;;;  "ob-ditaa.el" "ob-dot.el" "ob-ebnf.el" "ob-emacs-lisp.el"
+;;;;;;  "ob-eukleides.el" "ob-eval.el" "ob-exp.el" "ob-fomus.el"
+;;;;;;  "ob-forth.el" "ob-fortran.el" "ob-gnuplot.el" "ob-groovy.el"
+;;;;;;  "ob-haskell.el" "ob-hledger.el" "ob-io.el" "ob-java.el" "ob-js.el"
+;;;;;;  "ob-julia.el" "ob-keys.el" "ob-latex.el" "ob-ledger.el" "ob-lilypond.el"
+;;;;;;  "ob-lisp.el" "ob-lob.el" "ob-lua.el" "ob-makefile.el" "ob-mathematica.el"
+;;;;;;  "ob-mathomatic.el" "ob-matlab.el" "ob-maxima.el" "ob-mscgen.el"
+;;;;;;  "ob-ocaml.el" "ob-octave.el" "ob-org.el" "ob-oz.el" "ob-perl.el"
+;;;;;;  "ob-picolisp.el" "ob-plantuml.el" "ob-processing.el" "ob-python.el"
+;;;;;;  "ob-ref.el" "ob-ruby.el" "ob-sass.el" "ob-scheme.el" "ob-screen.el"
+;;;;;;  "ob-sed.el" "ob-shell.el" "ob-shen.el" "ob-smiles.el" "ob-sql.el"
+;;;;;;  "ob-sqlite.el" "ob-stan.el" "ob-stata.el" "ob-table.el" "ob-tangle.el"
+;;;;;;  "ob-tcl.el" "ob-vala.el" "ob-vbnet.el" "ob.el" "org-archive.el"
+;;;;;;  "org-attach.el" "org-bbdb.el" "org-bibtex-extras.el" "org-bibtex.el"
+;;;;;;  "org-bookmark.el" "org-checklist.el" "org-choose.el" "org-clock.el"
+;;;;;;  "org-collector.el" "org-contribdir.el" "org-crypt.el" "org-ctags.el"
+;;;;;;  "org-datetree.el" "org-depend.el" "org-docview.el" "org-drill.el"
+;;;;;;  "org-effectiveness.el" "org-element.el" "org-elisp-symbol.el"
+;;;;;;  "org-entities.el" "org-eshell.el" "org-eval-light.el" "org-eval.el"
+;;;;;;  "org-eww.el" "org-expiry.el" "org-faces.el" "org-feed.el"
+;;;;;;  "org-footnote.el" "org-git-link.el" "org-gnus.el" "org-habit.el"
+;;;;;;  "org-id.el" "org-indent.el" "org-info.el" "org-inlinetask.el"
+;;;;;;  "org-install.el" "org-interactive-query.el" "org-invoice.el"
+;;;;;;  "org-irc.el" "org-learn.el" "org-license.el" "org-list.el"
+;;;;;;  "org-loaddefs.el" "org-mac-iCal.el" "org-macro.el" "org-mairix.el"
+;;;;;;  "org-man.el" "org-mew.el" "org-mhe.el" "org-mobile.el" "org-mouse.el"
+;;;;;;  "org-notify.el" "org-notmuch.el" "org-panel.el" "org-pcomplete.el"
+;;;;;;  "org-plot.el" "org-plus-contrib-pkg.el" "org-protocol.el"
+;;;;;;  "org-rmail.el" "org-screen.el" "org-secretary.el" "org-src.el"
+;;;;;;  "org-static-mathjax.el" "org-sudoku.el" "org-table.el" "org-tempo.el"
+;;;;;;  "org-timer.el" "org-velocity.el" "org-vm.el" "org-w3m.el"
+;;;;;;  "org-wikinodes.el" "org-wl.el" "orgtbl-sqlinsert.el" "ox-ascii.el"
+;;;;;;  "ox-beamer.el" "ox-bibtex.el" "ox-confluence.el" "ox-deck.el"
+;;;;;;  "ox-extra.el" "ox-groff.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-s5.el" "ox-texinfo.el" "ox.el") (23994
+;;;;;;  46414 714072 533000))
 
 ;;;***
 
@@ -2733,6 +1688,5 @@ the reports is done using the TaskJuggler GUI.
 ;; version-control: never
 ;; no-byte-compile: t
 ;; no-update-autoloads: t
-;; coding: utf-8
 ;; End:
 ;;; org-plus-contrib-autoloads.el ends here
diff --git a/elpa/org-plus-contrib-20190930/org-plus-contrib-pkg.el b/elpa/org-plus-contrib-20191028/org-plus-contrib-pkg.el
similarity index 57%
rename from elpa/org-plus-contrib-20190930/org-plus-contrib-pkg.el
rename to elpa/org-plus-contrib-20191028/org-plus-contrib-pkg.el
index da56fb7c..8d960ca3 100644
--- a/elpa/org-plus-contrib-20190930/org-plus-contrib-pkg.el
+++ b/elpa/org-plus-contrib-20191028/org-plus-contrib-pkg.el
@@ -1,5 +1,5 @@
 (define-package "org-plus-contrib"
-  "20190930" "Outline-based notes management and organizer" ( ))
+  "20191028" "Outline-based notes management and organizer" ( ))
 ;; Local Variables:
 ;; no-byte-compile: t
 ;; End:
diff --git a/elpa/org-plus-contrib-20190930/org-protocol.el b/elpa/org-plus-contrib-20191028/org-protocol.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-protocol.el
rename to elpa/org-plus-contrib-20191028/org-protocol.el
diff --git a/elpa/org-plus-contrib-20190930/org-registry.el b/elpa/org-plus-contrib-20191028/org-registry.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-registry.el
rename to elpa/org-plus-contrib-20191028/org-registry.el
diff --git a/elpa/org-plus-contrib-20190930/org-rmail.el b/elpa/org-plus-contrib-20191028/org-rmail.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-rmail.el
rename to elpa/org-plus-contrib-20191028/org-rmail.el
diff --git a/elpa/org-plus-contrib-20190930/org-screen.el b/elpa/org-plus-contrib-20191028/org-screen.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-screen.el
rename to elpa/org-plus-contrib-20191028/org-screen.el
diff --git a/elpa/org-plus-contrib-20190930/org-screenshot.el b/elpa/org-plus-contrib-20191028/org-screenshot.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-screenshot.el
rename to elpa/org-plus-contrib-20191028/org-screenshot.el
diff --git a/elpa/org-plus-contrib-20190930/org-secretary.el b/elpa/org-plus-contrib-20191028/org-secretary.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-secretary.el
rename to elpa/org-plus-contrib-20191028/org-secretary.el
diff --git a/elpa/org-plus-contrib-20190930/org-src.el b/elpa/org-plus-contrib-20191028/org-src.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-src.el
rename to elpa/org-plus-contrib-20191028/org-src.el
diff --git a/elpa/org-plus-contrib-20190930/org-static-mathjax.el b/elpa/org-plus-contrib-20191028/org-static-mathjax.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-static-mathjax.el
rename to elpa/org-plus-contrib-20191028/org-static-mathjax.el
diff --git a/elpa/org-plus-contrib-20190930/org-sudoku.el b/elpa/org-plus-contrib-20191028/org-sudoku.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-sudoku.el
rename to elpa/org-plus-contrib-20191028/org-sudoku.el
diff --git a/elpa/org-plus-contrib-20190930/org-table.el b/elpa/org-plus-contrib-20191028/org-table.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-table.el
rename to elpa/org-plus-contrib-20191028/org-table.el
diff --git a/elpa/org-plus-contrib-20190930/org-tempo.el b/elpa/org-plus-contrib-20191028/org-tempo.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-tempo.el
rename to elpa/org-plus-contrib-20191028/org-tempo.el
diff --git a/elpa/org-plus-contrib-20190930/org-timer.el b/elpa/org-plus-contrib-20191028/org-timer.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-timer.el
rename to elpa/org-plus-contrib-20191028/org-timer.el
diff --git a/elpa/org-plus-contrib-20190930/org-toc.el b/elpa/org-plus-contrib-20191028/org-toc.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-toc.el
rename to elpa/org-plus-contrib-20191028/org-toc.el
diff --git a/elpa/org-plus-contrib-20190930/org-track.el b/elpa/org-plus-contrib-20191028/org-track.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-track.el
rename to elpa/org-plus-contrib-20191028/org-track.el
diff --git a/elpa/org-plus-contrib-20190930/org-velocity.el b/elpa/org-plus-contrib-20191028/org-velocity.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-velocity.el
rename to elpa/org-plus-contrib-20191028/org-velocity.el
diff --git a/elpa/org-plus-contrib-20190930/org-version.el b/elpa/org-plus-contrib-20191028/org-version.el
similarity index 92%
rename from elpa/org-plus-contrib-20190930/org-version.el
rename to elpa/org-plus-contrib-20191028/org-version.el
index 397801f1..edf61643 100644
--- a/elpa/org-plus-contrib-20190930/org-version.el
+++ b/elpa/org-plus-contrib-20191028/org-version.el
@@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "9.2.6-4-ge30905-elpaplus"))
+   (let ((org-git-version "9.2.6-5-g9c611f-elpaplus"))
      org-git-version))
 ;;;###autoload
 (defvar org-odt-data-dir "/usr/share/emacs/etc/org"
diff --git a/elpa/org-plus-contrib-20190930/org-vm.el b/elpa/org-plus-contrib-20191028/org-vm.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-vm.el
rename to elpa/org-plus-contrib-20191028/org-vm.el
diff --git a/elpa/org-plus-contrib-20190930/org-w3m.el b/elpa/org-plus-contrib-20191028/org-w3m.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-w3m.el
rename to elpa/org-plus-contrib-20191028/org-w3m.el
diff --git a/elpa/org-plus-contrib-20190930/org-wikinodes.el b/elpa/org-plus-contrib-20191028/org-wikinodes.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-wikinodes.el
rename to elpa/org-plus-contrib-20191028/org-wikinodes.el
diff --git a/elpa/org-plus-contrib-20190930/org-wl.el b/elpa/org-plus-contrib-20191028/org-wl.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org-wl.el
rename to elpa/org-plus-contrib-20191028/org-wl.el
diff --git a/elpa/org-plus-contrib-20190930/org.el b/elpa/org-plus-contrib-20191028/org.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/org.el
rename to elpa/org-plus-contrib-20191028/org.el
diff --git a/elpa/org-20190930/orgcard.pdf b/elpa/org-plus-contrib-20191028/orgcard.pdf
similarity index 99%
rename from elpa/org-20190930/orgcard.pdf
rename to elpa/org-plus-contrib-20191028/orgcard.pdf
index 9e256dec6cb2a8a39b9662745943605e8c25294c..494f3f0cf2782dd5018a758c3ad5ae3353d94d4a 100644
GIT binary patch
delta 117
zcmdlopMA@G_J%Et;>WlQ4U8-dfWXjjy5ccLVI=-`yJL)g9L{dWCT8X)CT_+~ZkDcQ
hF0MvyZieP&&Q6YIZjP?TrWSSzHiVQ+KYxz#DF8KNA6NhY

delta 117
zcmdlopMA@G_J%Et;>WlQER79-z{tpWy5ccLVI=-`yJL)g9L^TTZe|uPrmp6$t_E(-
hE(T7HP9}y1&PE2VrY1(F7H)P5HiVQ+KYxz#DF8D>9~J-r

diff --git a/elpa/org-plus-contrib-20190930/orgtbl-sqlinsert.el b/elpa/org-plus-contrib-20191028/orgtbl-sqlinsert.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/orgtbl-sqlinsert.el
rename to elpa/org-plus-contrib-20191028/orgtbl-sqlinsert.el
diff --git a/elpa/org-plus-contrib-20190930/ox-ascii.el b/elpa/org-plus-contrib-20191028/ox-ascii.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-ascii.el
rename to elpa/org-plus-contrib-20191028/ox-ascii.el
diff --git a/elpa/org-plus-contrib-20190930/ox-beamer.el b/elpa/org-plus-contrib-20191028/ox-beamer.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-beamer.el
rename to elpa/org-plus-contrib-20191028/ox-beamer.el
diff --git a/elpa/org-plus-contrib-20190930/ox-bibtex.el b/elpa/org-plus-contrib-20191028/ox-bibtex.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-bibtex.el
rename to elpa/org-plus-contrib-20191028/ox-bibtex.el
diff --git a/elpa/org-plus-contrib-20190930/ox-confluence.el b/elpa/org-plus-contrib-20191028/ox-confluence.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-confluence.el
rename to elpa/org-plus-contrib-20191028/ox-confluence.el
diff --git a/elpa/org-plus-contrib-20190930/ox-deck.el b/elpa/org-plus-contrib-20191028/ox-deck.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-deck.el
rename to elpa/org-plus-contrib-20191028/ox-deck.el
diff --git a/elpa/org-plus-contrib-20190930/ox-extra.el b/elpa/org-plus-contrib-20191028/ox-extra.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-extra.el
rename to elpa/org-plus-contrib-20191028/ox-extra.el
diff --git a/elpa/org-plus-contrib-20190930/ox-freemind.el b/elpa/org-plus-contrib-20191028/ox-freemind.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-freemind.el
rename to elpa/org-plus-contrib-20191028/ox-freemind.el
diff --git a/elpa/org-plus-contrib-20190930/ox-groff.el b/elpa/org-plus-contrib-20191028/ox-groff.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-groff.el
rename to elpa/org-plus-contrib-20191028/ox-groff.el
diff --git a/elpa/org-plus-contrib-20190930/ox-html.el b/elpa/org-plus-contrib-20191028/ox-html.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-html.el
rename to elpa/org-plus-contrib-20191028/ox-html.el
diff --git a/elpa/org-plus-contrib-20190930/ox-icalendar.el b/elpa/org-plus-contrib-20191028/ox-icalendar.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-icalendar.el
rename to elpa/org-plus-contrib-20191028/ox-icalendar.el
diff --git a/elpa/org-plus-contrib-20190930/ox-koma-letter.el b/elpa/org-plus-contrib-20191028/ox-koma-letter.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-koma-letter.el
rename to elpa/org-plus-contrib-20191028/ox-koma-letter.el
diff --git a/elpa/org-plus-contrib-20190930/ox-latex.el b/elpa/org-plus-contrib-20191028/ox-latex.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-latex.el
rename to elpa/org-plus-contrib-20191028/ox-latex.el
diff --git a/elpa/org-plus-contrib-20190930/ox-man.el b/elpa/org-plus-contrib-20191028/ox-man.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-man.el
rename to elpa/org-plus-contrib-20191028/ox-man.el
diff --git a/elpa/org-plus-contrib-20190930/ox-md.el b/elpa/org-plus-contrib-20191028/ox-md.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-md.el
rename to elpa/org-plus-contrib-20191028/ox-md.el
diff --git a/elpa/org-plus-contrib-20190930/ox-odt.el b/elpa/org-plus-contrib-20191028/ox-odt.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-odt.el
rename to elpa/org-plus-contrib-20191028/ox-odt.el
diff --git a/elpa/org-plus-contrib-20190930/ox-org.el b/elpa/org-plus-contrib-20191028/ox-org.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-org.el
rename to elpa/org-plus-contrib-20191028/ox-org.el
diff --git a/elpa/org-plus-contrib-20190930/ox-publish.el b/elpa/org-plus-contrib-20191028/ox-publish.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-publish.el
rename to elpa/org-plus-contrib-20191028/ox-publish.el
diff --git a/elpa/org-plus-contrib-20190930/ox-rss.el b/elpa/org-plus-contrib-20191028/ox-rss.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-rss.el
rename to elpa/org-plus-contrib-20191028/ox-rss.el
diff --git a/elpa/org-plus-contrib-20190930/ox-s5.el b/elpa/org-plus-contrib-20191028/ox-s5.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-s5.el
rename to elpa/org-plus-contrib-20191028/ox-s5.el
diff --git a/elpa/org-plus-contrib-20190930/ox-taskjuggler.el b/elpa/org-plus-contrib-20191028/ox-taskjuggler.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-taskjuggler.el
rename to elpa/org-plus-contrib-20191028/ox-taskjuggler.el
diff --git a/elpa/org-plus-contrib-20190930/ox-texinfo.el b/elpa/org-plus-contrib-20191028/ox-texinfo.el
similarity index 100%
rename from elpa/org-plus-contrib-20190930/ox-texinfo.el
rename to elpa/org-plus-contrib-20191028/ox-texinfo.el
diff --git a/elpa/org-plus-contrib-20190930/ox.el b/elpa/org-plus-contrib-20191028/ox.el
similarity index 99%
rename from elpa/org-plus-contrib-20190930/ox.el
rename to elpa/org-plus-contrib-20191028/ox.el
index ec9527fb..c02a6c44 100644
--- a/elpa/org-plus-contrib-20190930/ox.el
+++ b/elpa/org-plus-contrib-20191028/ox.el
@@ -4757,7 +4757,7 @@ code."
 
 ;;;; For Tables
 ;;
-;; `org-export-table-has-special-column-p' and and
+;; `org-export-table-has-special-column-p' and
 ;; `org-export-table-row-is-special-p' are predicates used to look for
 ;; meta-information about the table structure.
 ;;
diff --git a/elpa/org-ref-20191023.117/citeproc/csl/acs-nano.csl b/elpa/org-ref-20191023.117/citeproc/csl/acs-nano.csl
new file mode 100644
index 00000000..4b65ea3f
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/csl/acs-nano.csl
@@ -0,0 +1,214 @@
+
+
diff --git a/elpa/org-ref-20191023.117/citeproc/csl/author-year.el b/elpa/org-ref-20191023.117/citeproc/csl/author-year.el
new file mode 100644
index 00000000..a29d8ac2
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/csl/author-year.el
@@ -0,0 +1,92 @@
+;;; author-year.el --- Citation Style Lisp - the other CSL
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(setq citation-style
+  '((label . orcp-citation-author-year-label)
+    (prefix . "(")
+    (suffix . ")")
+    (delimiter . "; ")
+    (citeauthor . ((vertical-align . baseline)
+		   (label . orcp-citation-author-label)
+		   (prefix . "")
+		   (suffix . " ")))
+    (citeyear . ((vertical-align . baseline)
+		 (label . orcp-citation-year-label)
+		 (prefix . "")
+		 (suffix . " ")
+		 (chomp-leading-space . nil)
+		 ))))
+
+
+
+(setq bibliography-style
+  '((sort . nil)
+    (hanging-indent . 3)
+    (justification . full)
+    (spacing . 1)
+    (label . orcp-citation-author-year-label)
+    (label-prefix . "(")
+    (label-suffix . ") ")
+    (header . ((text . "Bibliography")
+	       (font-style . bold)))
+    ;; Formatting of fields
+    ;; Single author name
+    (author . ((initialize . t)		; use initials, not full names
+	       ;; use firstname and lastname symbols
+	       (name-order . (firstname lastname))
+	       (name-separator . " ")
+	       (et-al . 4)		; after 4 authors use et-al
+	       (delimiter . "; ")
+	       (last-author-delimiter . " and ")
+	       (suffix . "")
+	       (field-separator . ", ")
+	       ;; ; function to convert (first von last jr) to a string.)
+	       (name-format . ''format-author-name)
+	       (field-separator ", ")))
+
+    (title . ((font-style . italics)
+	      (suffix . "")
+	      (field-separator . ", ")))
+    (booktitle . ((font-style . italics)
+		  (suffix . "")
+		  (field-separator . "in ")))
+    (journal . ((suffix . "")
+		(field-separator . ", ")))
+    ;; here we use some logic to group volume(issue) or volume
+    (volume . ((suffix . (when (orcp-get-entry-field "number" entry)
+			   (orcp-issue entry)))
+	       (field-separator . ", ")))
+    (issue . ((font-style . bold)
+	      (prefix . "(")
+	      (suffix . ")")
+	      (field-separator . ", ")))
+    (pages . ((prefix . "pp. ")
+	      (suffix . "")
+	      (field-separator . " ")
+	      (collapse-range . nil)))
+    (year . ((prefix . "(")
+	     (suffix . ")")
+	     (field-separator . ".")))
+    (doi . ((prefix . " ")
+	    (suffix . ".")
+	    (field-separator . "")
+	    (formatter . orcp-doi-formatter)))
+    ;; Formatting of entries
+    (entries . ((article . (author title journal volume pages year doi))
+		(inproceedings . (author title booktitle year))
+		(book . (author title year))
+		(manual . (author title url doi))
+		(misc . (author title url doi))
+		(techreport . (author title institution year))
+		(mastersthesis . (author title school year))
+		(phdthesis . (author title school year))
+		(t . (author title year))))))
+
+(provide 'author-year)
+
+;;; author-year.el ends here
diff --git a/elpa/org-ref-20191023.117/citeproc/csl/unsrt-footnote.el b/elpa/org-ref-20191023.117/citeproc/csl/unsrt-footnote.el
new file mode 100644
index 00000000..66f212e0
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/csl/unsrt-footnote.el
@@ -0,0 +1,86 @@
+;;; unsrt-footnote.el --- Citation Style Lisp - the other CSL
+
+
+;;; Commentary:
+;; Convert citations to org-mode footnotes
+
+;;; Code:
+
+(setq citation-style
+  '((label . orcp-footnote-label)
+    (prefix . "")
+    (suffix . "")
+    ;; sort on increasing citation numbers.
+    (sort . (lambda (key1 key2)
+	      (let ((i1 (-find-index
+			 (lambda (entry)
+			   (string= key1 (car entry)))
+			 *orcp-unique-entries*))
+		    (i2 (-find-index
+			 (lambda (entry)
+			   (string= key2 (car entry)))
+			 *orcp-unique-entries*)))
+		(> i2 i1))))
+    (delimiter . ", ")
+    (vertical-align . baseline)))
+
+
+(setq bibliography-style
+  '((sort . nil)
+    (hanging-indent . 3)
+    (justification . full)
+    (spacing . 1)
+    (label . orcp-footnote-label)
+    (label-prefix . "")
+    (label-suffix . " ")
+    (header . ((text . "Bibliography")
+	       (font-style . bold)))
+    ;; Formatting of fields
+    ;; Single author name
+    (author . ((initialize . t)		; use initials, not full names
+	       (name-order . (lastname firstname))
+	       (name-separator . ", ")
+	       (et-al . 4)		; after 4 authors use et-al
+	       (delimiter . "; ")
+	       (last-author-delimiter . " and ")
+	       (suffix . "")
+	       (field-separator . ", ")
+	       ;; ; function to convert (first von last jr) to a string.)
+	       (name-format . ''format-author-name)
+	       (field-separator ", ")))
+    (title . ((font-style . italics)
+	      (suffix . "")
+	      (field-separator . ", ")))
+    (journal . ((suffix . "")
+		(field-separator . ", ")))
+    ;; here we use some logic to group volume(issue) or volume
+    (volume . ((suffix . (when (orcp-get-entry-field "number" entry)
+			   (orcp-issue entry)))
+	       (field-separator . ", ")))
+    (issue . ((font-style . bold)
+	      (prefix . "(")
+	      (suffix . ")")
+	      (field-separator . ", ")))
+    (pages . ((prefix . "pp. ")
+	      (suffix . "")
+	      (field-separator . " ")
+	      (collapse-range . nil)))
+    (year . ((prefix . "(")
+	     (suffix . ")")
+	     (field-separator . ".")))
+    (doi . ((prefix . " ")
+	    (suffix . ".")
+	    (field-separator . "")
+	    (formatter . orcp-doi-formatter)))
+    ;; Formatting of entries
+    (entries . ((article . (author title journal volume pages year doi))
+		(book . (author title year))
+		(misc . (author title url doi))
+		(techreport . (author title institution year))
+		(mastersthesis . (author title school year))
+		(phdthesis . (author title school year))
+		(t . (author title year))))))
+
+(provide 'unsrt)
+
+;;; unsrt.el ends here
diff --git a/elpa/org-ref-20191023.117/citeproc/csl/unsrt-paren.el b/elpa/org-ref-20191023.117/citeproc/csl/unsrt-paren.el
new file mode 100644
index 00000000..bfea5d13
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/csl/unsrt-paren.el
@@ -0,0 +1,107 @@
+;;; unsrt-paren.el --- numbered citations in ()
+
+;;; Commentary:
+;; This does not work well for brackets because org-mode interprets them as
+;; footnotes.
+
+;;; Code:
+
+(setq citation-style
+  '((label . orcp-citation-number-label)
+    (prefix . "(")
+    (suffix . ")")
+    (chomp-leading-space . nil)
+    (chomp-trailing-space . nil)
+    ;; sort on increasing citation numbers.
+    (sort . (lambda (key1 key2)
+	      (let ((i1 (-find-index
+			 (lambda (entry)
+			   (string= key1 (car entry)))
+			 *orcp-unique-entries*))
+		    (i2 (-find-index
+			 (lambda (entry)
+			   (string= key2 (car entry)))
+			 *orcp-unique-entries*)))
+		(> i2 i1))))
+    (collapse . 'orcp-collapse-numeric-range)
+    (delimiter . ",")
+    (vertical-align . baseline)
+    (transpose-punctuation . nil)	;put citations on right of punctuation
+    (citenum . ((vertical-align . baseline)
+		(prefix . "")
+		(suffix . "")
+		(chomp-leading-space . nil)
+		(chomp-trailing-space . nil)))
+    (citeauthor . ((vertical-align . baseline)
+		   (label . orcp-citation-author-label)
+		   (prefix . "")
+		   (suffix . "")
+		   (chomp-leading-space . nil)
+		   (chomp-trailing-space . nil)))
+    (citeyear . ((vertical-align . baseline)
+		 (label . orcp-citation-year-label)
+		 (prefix . "")
+		 (suffix . "")
+		 (chomp-leading-space . nil)
+		 (chomp-trailing-space . nil)))))
+
+
+(setq bibliography-style
+  '((sort . nil)
+    (hanging-indent . 3)
+    (justification . full)
+    (spacing . 1)
+    (label . orcp-citation-number-label)
+    (label-prefix . "")
+    (label-suffix . ") ")
+    (header . ((text . "Bibliography")
+	       (font-style . bold)))
+    ;; Formatting of fields
+    ;; Single author name
+    (author . ((initialize . t)		; use initials, not full names
+	       (name-order . (lastname firstname))
+	       (name-separator . ", ")
+	       (et-al . 4)		; after 4 authors use et-al
+	       (delimiter . "; ")
+	       (last-author-delimiter . " and ")
+	       (suffix . "")
+	       (field-separator . ", ")
+	       ;; ; function to convert (first von last jr) to a string.)
+	       (name-format . ''format-author-name)
+	       (field-separator ", ")))
+    (title . ((font-style . italics)
+	      (suffix . "")
+	      (field-separator . ", ")))
+    (journal . ((suffix . "")
+		(field-separator . ", ")))
+    ;; here we use some logic to group volume(issue) or volume
+    (volume . ((suffix . (when (orcp-get-entry-field "number" entry)
+			   (orcp-issue entry)))
+	       (field-separator . ", ")))
+    (issue . ((font-style . bold)
+	      (prefix . "(")
+	      (suffix . ")")
+	      (field-separator . ", ")))
+    (pages . ((prefix . "pp. ")
+	      (suffix . "")
+	      (field-separator . " ")
+	      (collapse-range . nil)))
+    (year . ((prefix . "(")
+	     (suffix . ")")
+	     (field-separator . ".")))
+    (doi . ((prefix . " ")
+	    (suffix . ".")
+	    (field-separator . "")
+	    (formatter . orcp-doi-formatter)))
+    ;; Formatting of entries
+    (entries . ((article . (author title journal volume pages year doi))
+		(book . (author title year))
+		(misc . (author title url doi))
+		(techreport . (author title institution year))
+		(mastersthesis . (author title school year))
+		(phdthesis . (author title school year))
+		(t . (author title year))))))
+
+(provide 'unsrt-paren)
+
+;;; unsrt-paren.el ends here
diff --git a/elpa/org-ref-20191023.117/citeproc/csl/unsrt.el b/elpa/org-ref-20191023.117/citeproc/csl/unsrt.el
new file mode 100644
index 00000000..9013ed31
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/csl/unsrt.el
@@ -0,0 +1,111 @@
+;;; unsrt.el --- Citation Style Lisp - the other CSL
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(setq citation-style
+  '((label . orcp-citation-number-label)
+    (prefix . "")
+    (suffix . "")
+    (chomp-leading-space . t)
+    (chomp-trailing-space . nil)
+    ;; sort on increasing citation numbers.
+    (sort . (lambda (key1 key2)
+	      (let ((i1 (-find-index
+			 (lambda (entry)
+			   (string= key1 (car entry)))
+			 *orcp-unique-entries*))
+		    (i2 (-find-index
+			 (lambda (entry)
+			   (string= key2 (car entry)))
+			 *orcp-unique-entries*)))
+		(> i2 i1))))
+    (collapse . 'orcp-collapse-numeric-range)
+    (delimiter . ",")
+    (vertical-align . superscript)
+    (transpose-punctuation . t)		;put citations on right of punctuation
+    (citenum . ((vertical-align . baseline)
+		(prefix . " ")
+		(suffix . " ")
+		(chomp-leading-space . nil)
+		(chomp-trailing-space . nil)))
+    (citeauthor . ((vertical-align . baseline)
+		   (label . orcp-citation-author-label)
+		   (prefix . "")
+		   (suffix . " ")
+		   (chomp-leading-space . nil)
+		   (chomp-trailing-space . nil)))
+    (citeyear . ((vertical-align . baseline)
+		 (label . orcp-citation-year-label)
+		 (prefix . "")
+		 (suffix . " ")
+		 (chomp-leading-space . nil)
+		 (chomp-trailing-space . nil)))))
+
+
+(setq bibliography-style
+      '((sort . nil)
+	(hanging-indent . 3)
+	(justification . full)
+	(spacing . 1)
+	(label . orcp-citation-number-label)
+	(label-prefix . "")
+	(label-suffix . ". ")
+	(header . ((text . "Bibliography")
+		   (font-style . bold)))
+	;; Formatting of fields
+	;; Single author name
+	(author . ((initialize . t)		; use initials, not full names
+		   (name-order . (lastname firstname))
+		   (name-separator . ", ")
+		   (et-al . 4)		; after 4 authors use et-al
+		   (delimiter . "; ")
+		   (last-author-delimiter . " and ")
+		   (suffix . "")
+		   (field-separator . ", ")
+		   ;; ; function to convert (first von last jr) to a string.)
+		   (name-format . ''format-author-name)
+		   (field-separator ", ")))
+	(title . ((font-style . italics)
+		  (suffix . "")
+		  (field-separator . ", ")))
+	(booktitle . ((font-style . italics)
+		      (suffix . "")
+		      (field-separator . "in ")))
+	(journal . ((suffix . "")
+		    (field-separator . ", ")))
+	;; here we use some logic to group volume(issue) or volume
+	(volume . ((suffix . (when (orcp-get-entry-field "number" entry)
+			       (orcp-issue entry)))
+		   (field-separator . ", ")))
+	(issue . ((font-style . bold)
+		  (prefix . "(")
+		  (suffix . ")")
+		  (field-separator . ", ")))
+	(pages . ((prefix . "pp. ")
+		  (suffix . "")
+		  (field-separator . " ")
+		  (collapse-range . nil)))
+	(year . ((prefix . "(")
+		 (suffix . ")")
+		 (field-separator . ".")))
+	(doi . ((prefix . " ")
+		(suffix . ".")
+		(field-separator . "")
+		(formatter . orcp-doi-formatter)))
+	;; Formatting of entries
+	(entries . ((article . (author title journal volume pages year doi))
+		    (inproceedings . (author title booktitle year))
+		    (book . (author title year))
+		    (misc . (author title url doi))
+		    (techreport . (author title institution year))
+		    (mastersthesis . (author title school year))
+		    (phdthesis . (author title school year))
+		    (t . (author title year))))))
+
+(provide 'unsrt)
+
+;;; unsrt.el ends here
diff --git a/elpa/org-ref-20191023.117/citeproc/readme-author-year.org b/elpa/org-ref-20191023.117/citeproc/readme-author-year.org
new file mode 100644
index 00000000..cb77f4e9
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/readme-author-year.org
@@ -0,0 +1,92 @@
+* DONE Introduction to a citation processor in org-ref
+  CLOSED: [2015-12-11 Fri 18:05]
+  :PROPERTIES:
+  :categories: emacs,orgref,orgmode,citations
+  :date:     2015/12/11 18:05:43
+  :updated:  2015/12/11 18:22:40
+  :END:
+
+As a potential solution for citions in org-mode for non-LaTeX export, here we introduce csl (citation syntax lisp). The idea is heavily influenced by the xml-based Citation Syntax Language, but uses lisp sexps instead.
+
+Briefly, there is a csl file that contains two variables: citation-style and bibliography-style. The citation-style defines how the in-text citations are represented for different types of citations. The bibliography-style defines how the bibliography is constructed.
+
+What do we gain by this?
+1. No need for external citeproc program, and hackability by org-mode experts.
+2. Punctuation transposition and space chomping, i.e. put superscripts on the right side of punctuation if you want it, and remove whitespace before superscripts if you want it.
+3. Total tunability of the citation format to different backends.
+4. Easy to change bibliography format with the bibliographystyle link.
+5. The use of Bibtex databases. These are plain text, and flexible.
+
+The real code for this is too long to blog about. Instead, you should check it out here: https://github.com/jkitchin/org-ref/tree/master/citeproc
+
+** Reference types
+
+- A book cite:kittel-2005-introd-solid.
+
+- An article cite:kitchin-2015-examp
+
+- A miscellaneous bibtex type cite:xu-suppor.
+
+There is work to do in supporting other types of entry types that are common in bibtex files.
+
+** Citation types
+
+- Regular citation:  cite:kitchin-2015-examp
+- citenum: See Ref. citenum:kitchin-2015-examp
+- citeauthor:  citeauthor:kitchin-2015-examp
+- citeyear:   citeyear:kitchin-2015-examp
+
+There is work to do in supporting other types of citations.
+
+** Multiple citations and sorting within citation
+You can specify that the cites within a citation are consistently sorted in the export.
+
+- a,b: cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien
+- b,a: cite:kitchin-2015-data-surfac-scien,kitchin-2015-examp
+
+There is work to do for range collapsing, e.g. to turn 1,2,3 into 1-3.
+** Space chomping and punctuation testing
+I think citations should always be put in the sentence they logically belong to. LaTeX has a feature through natbib I think where for some styles, e.g. superscripts, the citations are moved to the right side of punctuation, and whitespace is chomped so the superscript is next to words, not separated by spaces. We can do that here too.
+
+- Citation at end of sentence cite:kitchin-2015-examp.
+- Citation in clause cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien, with a comma.
+- Citation in middle of cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien a sentence.
+
+** Building
+   :PROPERTIES:
+   :date:     2015/12/11 14:47:59
+   :updated:  2015/12/11 14:48:26
+   :END:
+
+At the moment, you have to add a hook function to put the replacements in the document before parsing.
+
+#+BEGIN_SRC emacs-lisp
+(add-to-list 'load-path ".")
+(require 'org-ref-citeproc)
+
+(let ((org-export-before-parsing-hook '(orcp-citeproc)))
+  (browse-url (org-html-export-to-html)))
+#+End_src
+
+#+RESULTS:
+: #
+
+
+** Summary thoughts
+This looks promising. There is probably a lot of work to do to make this as robust as say citeproc-js or the Zotero handler. I am not sure if we could write this in a way to directly use the CSL. My feeling is it would not be as flexible as this, and we would have to add to it anyway.
+
+Here are some remaining things that could be worked on if we continue this direction.
+
+1. Other bibtex entries need to be tested out.
+2. Remaining bibtex fields need to be defined.
+3. Standardization of styling that can be done. Not all features described in my csl are supported, e.g. et. al. and probably others.
+4. The author-year style needs name disambiguation somehow.
+5. Hyperlinking in html.
+6. Make sure export to other backends works.
+7. Can this work for notes-based styles?
+
+** Bibliography
+You use a bibliographystyle link to specify a csl. These are similar to bibtex styles, and in some cases no change is needed for LaTeX export (although you may have to remove the citeproc hook function).
+
+bibliographystyle:author-year
+bibliography:~/Dropbox/bibliography/references.bib
diff --git a/elpa/org-ref-20191023.117/citeproc/readme-unsrt.org b/elpa/org-ref-20191023.117/citeproc/readme-unsrt.org
new file mode 100644
index 00000000..cf4d0bd7
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/readme-unsrt.org
@@ -0,0 +1,93 @@
+* DONE Introduction to a citation processor in org-ref
+  CLOSED: [2015-12-11 Fri 18:05]
+  :PROPERTIES:
+  :categories: emacs,orgref,orgmode,citations
+  :date:     2015/12/11 18:05:43
+  :updated:  2015/12/11 18:22:40
+  :END:
+
+As a potential solution for citions in org-mode for non-LaTeX export, here we introduce csl (citation syntax lisp). The idea is heavily influenced by the xml-based Citation Syntax Language, but uses lisp sexps instead.
+
+Briefly, there is a csl file that contains two variables: citation-style and bibliography-style. The citation-style defines how the in-text citations are represented for different types of citations. The bibliography-style defines how the bibliography is constructed.
+
+What do we gain by this?
+1. No need for external citeproc program, and hackability by org-mode experts.
+2. Punctuation transposition and space chomping, i.e. put superscripts on the right side of punctuation if you want it, and remove whitespace before superscripts if you want it.
+3. Total tunability of the citation format to different backends.
+4. Easy to change bibliography format with the bibliographystyle link.
+5. The use of Bibtex databases. These are plain text, and flexible.
+
+The real code for this is too long to blog about. Instead, you should check it out here: https://github.com/jkitchin/org-ref/tree/master/citeproc
+
+** Reference types
+
+- A book cite:kittel-2005-introd-solid.
+
+- An article cite:kitchin-2015-examp
+
+- A miscellaneous bibtex type cite:xu-suppor.
+
+There is work to do in supporting other types of entry types that are common in bibtex files.
+
+** Citation types
+
+- Regular citation:  cite:kitchin-2015-examp
+- citenum: See Ref. citenum:kitchin-2015-examp
+- citeauthor:  citeauthor:kitchin-2015-examp
+- citeyear:   citeyear:kitchin-2015-examp
+
+There is work to do in supporting other types of citations.
+
+** Multiple citations and sorting within citation
+You can specify that the cites within a citation are consistently sorted in the export.
+
+- a,b: cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien
+- b,a: cite:kitchin-2015-data-surfac-scien,kitchin-2015-examp
+
+There is work to do for range collapsing, e.g. to turn 1,2,3 into 1-3.
+** Space chomping and punctuation testing
+I think citations should always be put in the sentence they logically belong to. LaTeX has a feature through natbib I think where for some styles, e.g. superscripts, the citations are moved to the right side of punctuation, and whitespace is chomped so the superscript is next to words, not separated by spaces. We can do that here too.
+
+- Citation at end of sentence cite:kitchin-2015-examp.
+- Citation in clause cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien, with a comma.
+- Citation in middle of cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien a sentence.
+
+** Building
+   :PROPERTIES:
+   :date:     2015/12/11 14:47:59
+   :updated:  2015/12/11 14:48:26
+   :END:
+
+At the moment, you have to add a hook function to put the replacements in the document before parsing.
+
+#+BEGIN_SRC emacs-lisp
+(add-to-list 'load-path ".")
+(require 'org-ref-citeproc)
+
+(when (file-exists-p "readme.html") (delete-file "readme.html"))
+(let ((org-export-before-parsing-hook '(orcp-citeproc)))
+  (browse-url (org-html-export-to-html)))
+#+End_src
+
+#+RESULTS:
+: #
+
+
+** Summary thoughts
+This looks promising. There is probably a lot of work to do to make this as robust as say citeproc-js or the Zotero handler. I am not sure if we could write this in a way to directly use the CSL. My feeling is it would not be as flexible as this, and we would have to add to it anyway.
+
+Here are some remaining things that could be worked on if we continue this direction.
+
+1. Other bibtex entries need to be tested out.
+2. Remaining bibtex fields need to be defined.
+3. Standardization of styling that can be done. Not all features described in my csl are supported, e.g. et. al. and probably others.
+4. The author-year style needs name disambiguation somehow.
+5. Hyperlinking in html.
+6. Make sure export to other backends works.
+7. Can this work for notes-based styles?
+
+** Bibliography
+You use a bibliographystyle link to specify a csl. These are similar to bibtex styles, and in some cases no change is needed for LaTeX export (although you may have to remove the citeproc hook function).
+
+bibliographystyle:unsrt
+bibliography:~/Dropbox/bibliography/references.bib
diff --git a/elpa/org-ref-20191023.117/citeproc/readme.bib b/elpa/org-ref-20191023.117/citeproc/readme.bib
new file mode 100644
index 00000000..3685a3b4
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/readme.bib
@@ -0,0 +1,203 @@
+
+@techreport{2011-mater-genom,
+   title = {Materials Genome Initiative for Global Competitiveness},
+   institution = {National Science and Technology Council},
+   year = {2011},
+   type = {Report}
+}
+
+@phdthesis{Hossein-thesis,
+  author =	 {Hossein Pourmatin},
+  title =	 {Computational Multiscale Methods for Defects: 1. Line Defects
+                  in Liquid Crystals; 2. Electron Scattering in Defected
+                  Crystals},
+  school =	 {Carnegie Mellon University},
+  year =	 2014,
+  note =	 {Available at
+                  \url{sites.google.com/site/kaushikdayal/publications#Theses}}
+}
+
+@inproceedings{abolhasani-2011-model,
+  Author =	 {Abolhasani, M. and Kumacheva, E. and G{\"u}nther,
+                  A.},
+  Title =	 {Model-predictive Strategy for Exploration of Carbon
+                  Dioxide Dissolution and Mass Transfer},
+  Booktitle =	 {15th International Conference on Miniaturized
+                  Systems for Chemistry and Life Sciences},
+  Year =	 2011,
+  Month =	 {October},
+  Url =
+                  {"http://www.rsc.org/images/LOC/2011/PDFs/Papers/224_1180.pdf}
+}
+
+@article{anderson-1977-raman,
+  author =	 {George R. Anderson},
+  title =	 {The {R}aman Spectra of Carbon Dioxide in Liquid Water and
+                  Water-D2},
+  journal =	 {J. Phys. Chem.},
+  volume =	 81,
+  number =	 3,
+  pages =	 {273-276},
+  year =	 1977,
+  doi =		 {10.1021/j100518a017},
+  url =		 {http://dx.doi.org/10.1021/j100518a017},
+  month =	 2,
+  eprint =	 {http://pubs.acs.org/doi/pdf/10.1021/j100518a017},
+}
+
+@MastersThesis{ding-2012-metal-oxide,
+  author =	 {Zhizhong Ding},
+  title =	 {Metal Oxide Oxygen Carriers for Chemical-Looping Combustion},
+  school =	 {Carnegie Mellon University},
+  year =	 2012}
+
+@article{kitchin-2015-data-surfac-scien,
+  author =	 "John R. Kitchin",
+  title =	 {Data Sharing in Surface Science},
+  journal =	 "Surface Science ",
+  volume =	 "N/A",
+  pages =	 "in press",
+  year =	 2015,
+  doi =		 {10.1016/j.susc.2015.05.007},
+  url =
+                  "http://www.sciencedirect.com/science/article/pii/S0039602815001326",
+  issn =	 "0039-6028",
+  keywords =	 {DESC0004031, early-career, orgmode, Data sharing },
+}
+
+@article{kitchin-2015-examp,
+  author =	 {Kitchin, John R.},
+  title =	 {Examples of Effective Data Sharing in Scientific Publishing},
+  journal =	 {ACS Catalysis},
+  volume =	 {5},
+  number =	 {6},
+  pages =	 {3894-3899},
+  year =	 2015,
+  doi =		 {10.1021/acscatal.5b00538},
+  url =		 { http://dx.doi.org/10.1021/acscatal.5b00538 },
+  keywords =	 {DESC0004031, early-career, orgmode, Data sharing },
+  eprint =	 { http://dx.doi.org/10.1021/acscatal.5b00538 },
+}
+
+@book{kittel-2005-introd-solid,
+  author =	 {Charles Kittel},
+  title =	 {Introduction to Solid State Physics},
+  publisher =	 {Wiley},
+  year =	 2005,
+  edition =	 {8th}
+}
+
+@misc{xu-suppor,
+  author =	 {Zhongnan Xu and Jan Rossmeisl and John R. Kitchin},
+  title =	 {Supporting data for: A linear response, {DFT+U} study of trends
+                  in the oxygen evolution activity of transition metal rutile
+                  dioxides. doi:10.5281/zenodo.12635},
+  keywords =	 {DESC0004031, early-career, },
+  year =         {2015},
+  url =		 {https://zenodo.org/record/12635},
+  doi =		 {10.5281/zenodo.12635}
+}
+
+@article{ye-2012-proces-charac,
+  author =	 {Y. E. Chunbo and Guangwen CHEN and Quan YUAN},
+  title =	 {Process Characteristics of \ce{CO2} Absorption By Aqueous
+                  Monoethanolamine in a Microchannel Reactor},
+  journal =	 {Chinese Journal of Chemical Engineering},
+  volume =	 20,
+  number =	 1,
+  pages =	 {111-119},
+  year =	 2012,
+  doi =		 {10.1016/s1004-9541(12)60370-x},
+  url =		 {http://dx.doi.org/10.1016/S1004-9541(12)60370-X},
+}
+
+@article{yeo-2012-in-situ,
+  author =	 {Yeo, Boon Siang and Bell, Alexis T.},
+  title =	 {In Situ {R}aman Study of Nickel Oxide and Gold-Supported
+                  Nickel Oxide Catalysts for the Electrochemical Evolution of
+                  Oxygen},
+  journal =	 {The Journal of Physical Chemistry C},
+  volume =	 116,
+  number =	 15,
+  pages =	 {8394-8400},
+  year =	 2012,
+  doi =		 {10.1021/jp3007415},
+  url =		 {http://pubs.acs.org/doi/abs/10.1021/jp3007415},
+  eprint =	 {http://pubs.acs.org/doi/pdf/10.1021/jp3007415},
+}
+
+@article{zhu-2013-sulfur,
+  author =	 {Zhu, Qingjun and Wegener, Staci L. and Xie, Chao and Uche,
+                  Obioma and Neurock, Matthew and Marks, Tobin J.},
+  title =	 {Sulfur As a Selective "soft" Oxidant for Catalytic Methane
+                  Conversion Probed By Experiment and Theory},
+  journal =	 {Nature chemistry},
+  volume =	 5,
+  pages =	 {104-109},
+  year =	 2013,
+  doi =		 "10.1002/ange.201311111",
+  url =
+                  "http://www.nature.com/nchem/journal/v5/n2/full/nchem.1527.html",
+}
+
+@article{lizzit-2001-surfac-ru,
+  author =	 {S. Lizzit and A. Baraldi and A. Groso and K. Reuter and M. V.
+                  Ganduglia-Pirovano and C. Stampfl and M. Scheffler and M.
+                  Stichler and C. Keller and W. Wurth and D. Menzel},
+  title =	 {Surface Core-Level Shifts of Clean and Oxygen-Covered
+                  {Ru}(0001)},
+  journal =	 {Phys. Rev. B},
+  volume =	 63,
+  number =	 20,
+  pages =	 {205419},
+  year =	 2001,
+  doi =		 {10.1103/physrevb.63.205419},
+  url =		 {http://dx.doi.org/10.1103/physrevb.63.205419},
+  date_added =	 {Mon Nov 16 16:28:01 2015},
+}
+
+@article{weaver-2011-high-selec,
+  author =	 {Jason F. Weaver and Can Hakanoglu and Abbin Antony and Aravind
+                  Asthagiri},
+  title =	 {High Selectivity for Primary {C-H} Bond Cleavage of Propane
+                  $\sigma$-complexes on the {PdO}(101) Surface},
+  keywords =	 {alkane},
+  journal =	 {J. Am. Chem. Soc.},
+  volume =	 133,
+  number =	 40,
+  pages =	 {16196-16200},
+  year =	 2011,
+  doi =		 {10.1021/ja206599k},
+  url =		 {http://dx.doi.org/10.1021/ja206599k},
+  date_added =	 {Sat Nov 28 09:10:59 2015},
+}
+
+@article{antony-2012-pathw-c,
+  author =	 {Abbin Antony and Aravind Asthagiri and Jason F. Weaver},
+  title =	 {Pathways for {C-H} Bond Cleavage of Propane $\sigma$-complexes on
+                  {PdO}(101)},
+  keywords =	 {alkane},
+  journal =	 {Phys. Chem. Chem. Phys.},
+  volume =	 14,
+  number =	 35,
+  pages =	 12202,
+  year =	 2012,
+  doi =		 {10.1039/c2cp41900a},
+  url =		 {http://dx.doi.org/10.1039/c2cp41900a},
+  date_added =	 {Sat Nov 28 09:13:32 2015},
+}
+
+@article{wang-2013-immob-co2,
+  author =	 {Xianfeng Wang and Novruz G. Akhmedov and Yuhua Duan and David
+                  Luebke and Bingyun Li},
+  title =	 {Immobilization of Amino Acid Ionic Liquids Into Nanoporous
+                  Microspheres As Robust Sorbents for CO2 Capture},
+  journal =	 {J. Mater. Chem. A},
+  volume =	 1,
+  number =	 9,
+  pages =	 2978,
+  year =	 2013,
+  doi =		 {10.1039/c3ta00768e},
+  url =		 {http://dx.doi.org/10.1039/C3TA00768E},
+  date_added =	 {Thu Dec 3 06:13:09 2015},
+}
diff --git a/elpa/org-ref-20191023.117/citeproc/readme.org b/elpa/org-ref-20191023.117/citeproc/readme.org
new file mode 100644
index 00000000..dfefd263
--- /dev/null
+++ b/elpa/org-ref-20191023.117/citeproc/readme.org
@@ -0,0 +1,1676 @@
+
+http://editor.citationstyles.org/styleInfo/?styleId=http%3A%2F%2Fwww.zotero.org%2Fstyles%2Facs-nano
+
+http://docs.citationstyles.org/en/stable/primer.html#preface
+
+* DONE Introduction to a citation processor in org-ref
+  CLOSED: [2015-12-11 Fri 18:05]
+  :PROPERTIES:
+  :categories: emacs,orgref,orgmode,citations
+  :date:     2015/12/11 18:05:43
+  :updated:  2015/12/12 10:08:10
+  :END:
+
+As a potential solution for citations in org-mode for non-LaTeX export, here we introduce csl (citation syntax lisp). The idea is heavily influenced by the xml-based Citation Syntax Language, but uses lisp sexps instead.
+
+Briefly, there is a csl file that contains two variables: citation-style and bibliography-style. The citation-style defines how the in-text citations are represented for different types of citations. The bibliography-style defines how the bibliography is constructed.
+
+What do we gain by this?
+1. No need for external citeproc program, and hackability by org-mode experts.
+2. Punctuation transposition and space chomping, i.e. put superscripts on the right side of punctuation if you want it, and remove whitespace before superscripts if you want it.
+3. Total tunability of the citation format to different backends.
+4. Easy to change bibliography format with the bibliographystyle link.
+5. The use of Bibtex databases. These are plain text, and flexible.
+
+The real code for this is too long to blog about. Instead, you should check it out here: https://github.com/jkitchin/org-ref/tree/master/citeproc
+
+** Reference types
+
+- A book cite:kittel-2005-introd-solid.
+
+- An article cite:kitchin-2015-examp
+
+- A miscellaneous bibtex type cite:xu-suppor.
+
+- A technical report cite:2011-mater-genom
+
+- An MS thesis: cite:ding-2012-metal-oxide
+
+- A PhD thesis: cite:Hossein-thesis
+
+- in proceedings: cite:abolhasani-2011-model
+
+There is work to do in supporting other types of entry types that are common in bibtex files.
+
+** Citation types
+
+- Regular citation:  cite:kitchin-2015-examp
+- citenum: See Ref. citenum:kitchin-2015-examp
+- citeauthor:  citeauthor:kitchin-2015-examp
+- citeyear:   citeyear:kitchin-2015-examp
+
+There is work to do in supporting other types of citations.
+
+** Multiple citations and sorting within citation
+You can specify that the cites within a citation are consistently sorted in the export.
+
+- a,b: cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien
+- b,a: cite:kitchin-2015-data-surfac-scien,kitchin-2015-examp
+
+There is work to do for range collapsing, e.g. to turn 1,2,3 into 1-3.
+** Space chomping and punctuation testing
+I think citations should always be put in the sentence they logically belong to. LaTeX has a feature through natbib I think where for some styles, e.g. superscripts, the citations are moved to the right side of punctuation, and whitespace is chomped so the superscript is next to words, not separated by spaces. We can do that here too.
+
+- Citation at end of sentence cite:kitchin-2015-examp.
+- Citation in clause cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien, with a comma.
+- Citation in middle of cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien a sentence.
+
+** Building
+   :PROPERTIES:
+   :date:     2015/12/11 14:47:59
+   :updated:  2015/12/11 14:48:26
+   :END:
+
+At the moment, you have to add a hook function to put the replacements in the document before parsing.
+
+#+BEGIN_SRC emacs-lisp
+(add-to-list 'load-path ".")
+(require 'org-ref-citeproc)
+
+(when (file-exists-p "readme.html") (delete-file "readme.html"))
+(let ((org-export-before-parsing-hook '(orcp-citeproc)))
+  (browse-url (org-html-export-to-html)))
+#+End_src
+
+#+RESULTS:
+: #
+
+An org export for footnotes. The footnotes don't go where I expect.
+#+BEGIN_SRC emacs-lisp
+(add-to-list 'load-path ".")
+(require 'org-ref-citeproc)
+
+(let ((org-export-before-parsing-hook '(orcp-citeproc)))
+  (org-open-file (org-org-export-to-org)))
+#+End_src
+
+#+RESULTS:
+: Position saved to mark ring, go back with C-c &.
+
+** Summary thoughts
+This looks promising. There is probably a lot of work to do to make this as robust as say citeproc-js or the Zotero handler. I am not sure if we could write this in a way to directly use the CSL. My feeling is it would not be as flexible as this, and we would have to add to it anyway.
+
+Here are some remaining things that could be worked on if we continue this direction.
+
+1. Other bibtex entries need to be tested out.
+2. Remaining bibtex fields need to be defined.
+3. Standardization of styling that can be done. Not all features described in my csl are supported, e.g. et. al. and probably others.
+4. The author-year style needs name disambiguation somehow.
+5. Hyperlinking in org, html.
+6. Make sure export to other backends works. Can this make a LaTeX output with bibitems?
+7. Can this work for notes-based styles?
+
+** Bibliography
+You use a bibliographystyle link to specify a csl. These are similar to bibtex styles, and in some cases no change is needed for LaTeX export (although you may have to remove the citeproc hook function).
+
+bibliographystyle:unsrt-footnote
+bibliography:readme.bib
+
+
+* Archive work
+These are sections I worked on developing the working approach.
+** Parsing bibtex names
+Partially derived from http://nwalsh.com/tex/texhelp/bibtx-23.html
+
+see also http://ctan.mirrors.hoobly.com/biblio/bibtex/base/btxdoc.pdf
+
+
+Bibtex names have 4 parts:
+1. First name, which also includes middle name/initial
+2. von which is part of the last name, but in lower case letters
+3. Last name
+4. Jr.
+
+Here are some acceptable formats for names in Bibtex.
+#+BEGIN_EXAMPLE
+"First von Last"
+"von Last, First"
+"von Last, Jr, First"
+#+END_EXAMPLE
+
+Note, it is also possible to have in Bibtex, in which case the von part becomes part of the last name.
+#+BEGIN_EXAMPLE
+"Jan A. {van Mieghem}"
+"{van Mieghem}, Jan A."
+#+END_EXAMPLE
+
+And also
+
+#+BEGIN_EXAMPLE
+De Gaulle, Charles
+Van Buren, Martin
+Scott Thomas, Kristin
+Bonham Carter, Helena
+Garcia Pascual, Antonio
+Del Negro, Marco
+Van Gogh, Vincent
+Della Francesca, Piero
+
+Charles {De Gaulle}
+Martin {Van Buren}
+Kristin {Scott Thomas}
+Helena {Bonham Carter}
+Antonio {Garcia Pascual}
+Marco {Del Negro}
+Vincent {Van Gogh}
+Piero {Della Francesca}
+#+END_EXAMPLE
+
+Dealing with these brackets is somewhat tricky. We cannot simply split on spaces with these present. A hack I will use is to replace them temporarily with something that looks like a name part, parse, and then put them back. Otherwise, we need a real recursive descent parser. I will use a uuid that starts with a capital letter. We develop an elisp function to parse these into a data structure: (first von last jr).
+
+
+
+#+BEGIN_SRC emacs-lisp
+
+
+#+END_SRC
+
+#+RESULTS:
+: citeproc-parse-authorname
+
+Here are examples of case 1.
+#+BEGIN_SRC emacs-lisp
+(cl-loop for author in '("John R. Kitchin"
+                      "John von Kitchin"
+                      "John von de La von Kitchin"
+                      "John von de Kitchin Jr."
+                      "John {von de Kitchin}"
+                      "John Paul Jones"
+                      "Charles Louis Xavier Joseph de la Vallee Poussin"
+                      "Ludwig von Beethoven"
+                      "Jan A. {van Mieghem}"
+                      "Vincent {Van Gogh}"
+                      "Piero {Della Francesca}"
+                      "{Barnes and Noble}"
+                      "{Barnes & Noble}")
+      collect (citeproc-parse-authorname author))
+#+END_SRC
+
+#+RESULTS:
+| John R.                     | nil           | Kitchin            | nil |
+| John                        | von           | Kitchin            | nil |
+| John                        | von de La von | Kitchin            | nil |
+| John                        | von de        | Kitchin Jr.        | nil |
+| John                        | nil           | {von de Kitchin}   | nil |
+| John Paul                   | nil           | Jones              | nil |
+| Charles Louis Xavier Joseph | de la         | Vallee Poussin     | nil |
+| Ludwig                      | von           | Beethoven          | nil |
+| Jan A.                      | nil           | {van Mieghem}      | nil |
+| Vincent                     | nil           | {Van Gogh}         | nil |
+| Piero                       | nil           | {Della Francesca}  | nil |
+|                             | nil           | {Barnes and Noble} | nil |
+|                             | nil           | {Barnes & Noble}   | nil |
+
+Case 2.
+#+BEGIN_SRC emacs-lisp
+(cl-loop for author in '("von Beethoven, Ludwig"
+                      "{van {M}ieghem}, Jan A."
+                      "De Gaulle, Charles"
+                      "Van Buren, Martin"
+                      "Scott Thomas, Kristin"
+                      "Bonham Carter, Helena"
+                      "Garcia Pascual, Antonio"
+                      "Del Negro, Marco"
+                      "Van Gogh, Vincent"
+                      "Della Francesca, Piero")
+      collect (citeproc-parse-authorname author))
+#+END_SRC
+
+#+RESULTS:
+| Ludwig  | von | Beethoven       | nil |
+| Jan A.  | nil | {van {M}ieghem} | nil |
+| Charles | nil | De Gaulle       | nil |
+| Martin  | nil | Van Buren       | nil |
+| Kristin | nil | Scott Thomas    | nil |
+| Helena  | nil | Bonham Carter   | nil |
+| Antonio | nil | Garcia Pascual  | nil |
+| Marco   | nil | Del Negro       | nil |
+| Vincent | nil | Van Gogh        | nil |
+| Piero   | nil | Della Francesca | nil |
+
+And case 3
+#+BEGIN_SRC emacs-lisp
+(cl-loop for author in '("von de la Kitchin, Sr., John Robert"
+                      "von Kitchin, Sr., John Robert")
+      collect (citeproc-parse-authorname author))
+#+END_SRC
+
+#+RESULTS:
+| John Robert | von de la | Kitchin | Sr. |
+| John Robert | von       | Kitchin | Sr. |
+
+
+I am pretty satisfied with that. This is a foundation for formatting author names in a bibliography. Note the bibtex function `bibtex-autokey-demangle-name' function has some similar code for getting a last name to use as the key.
+
+From http://maverick.inria.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html#names
+#+BEGIN_SRC emacs-lisp
+(cl-loop for author in '("Aa Bb"
+                      "Aa"
+                      "Aa bb"
+                      "aa"
+                      "Aa bb Cc"
+                      "Aa bb Cc dd Ee"
+                      "Aa 1B cc dd"
+                      "Aa 1b cc dd"
+                      "Aa {b}B cc dd"
+                      "Aa {b}b cc dd"
+                      "Aa {B}b cc dd"
+                      "Aa {B}B cc dd"
+                      "Aa \\Bb{b} cc dd"
+                      "Aa \\bb{b} cc dd"
+                      "{Lastname with {,} in it}, Formerly Known as"
+                      "Aa {bb} cc Dd"
+                      "Aa bb {cc} Dd"
+                      "Aa {bb} Cc")
+      collect (citeproc-parse-authorname author))
+#+END_SRC
+
+#+RESULTS:
+| Aa                | nil       | Bb                        | nil |
+| nil               | nil       | Aa                        | nil |
+| Aa                | nil       | bb                        | nil |
+| nil               | nil       | aa                        | nil |
+| Aa                | bb        | Cc                        | nil |
+| Aa                | bb Cc dd  | Ee                        | nil |
+| Aa                | 1B cc     | dd                        | nil |
+| Aa                | 1b cc     | dd                        | nil |
+| Aa                | {b}B cc   | dd                        | nil |
+| Aa {b}b           | cc        | dd                        | nil |
+| Aa {B}b           | cc        | dd                        | nil |
+| Aa                | {B}B cc   | dd                        | nil |
+| Aa                | \Bb{b} cc | dd                        | nil |
+| Aa                | \bb{b} cc | dd                        | nil |
+| Formerly Known as | nil       | {Lastname with {,} in it} | nil |
+| Aa {bb}           | cc        | Dd                        | nil |
+| Aa                | bb        | {cc} Dd                   | nil |
+| Aa {bb}           | nil       | Cc                        | nil |
+
+
+I think this does about what it is supposed to do. Another function would be responsible for formatting the author name as required, e.g. putting initials in, the order of the names, etc...
+
+Another function after that would be responsible for formatting a group of authors, e.g. specifying the delimiter between them, the trailing character after the authors, if et al should be used after some number of authors, etc...
+
+Finally, I don't consider any transformations of the author strings, e.g. if there are LaTeX commands or other markup in them. This gets passed verbatim to what ever is next.
+
+** Collapse numeric ranges
+Make (1 2 3 4 7 9) be "1-4,7,9"
+
+#+BEGIN_SRC emacs-lisp
+(defun collapse-range (cites)
+  "CITES is a list of at least 3 numbers."
+  (let (n
+        (groups '()))
+    (while cites
+      (setq n (pop cites))
+      (if (and (caar groups) (= (- n 1) (elt (car groups) 0)))
+          (setf (car groups) (append `(,n) (car groups)))
+        (setf groups (append `((,n)) groups))))
+    ;; Now for each group
+    (mapconcat 'identity
+               (mapcar
+                (lambda (lst)
+                  (cond
+                   ((>= (length lst) 3)
+                    (format "%s-%s" (car lst) (car (last lst))))
+                   ((= (length lst) 2)
+                    (format "%s,%s" (nth 0 lst) (nth 1 lst)))
+                   (t
+                    (number-to-string (car lst)))))
+                (mapcar 'reverse (reverse groups)))
+               ",")))
+
+(collapse-range '(1 2))
+
+#+END_SRC
+
+#+RESULTS:
+: 1,2
+
+** CSL parsing
+
+*** Info nodes
+This seems to be information about a CSL.
+#+BEGIN_SRC emacs-lisp
+(let (xml)
+  (setq xml (with-temp-buffer
+              (insert-file-contents "acs-nano.csl")
+              (libxml-parse-xml-region (point-min) (point-max))))
+  (xml-get-children xml 'info))
+#+END_SRC
+
+#+RESULTS:
+#+BEGIN_SRC emacs-lisp
+((info nil
+       (title nil "ACS Nano")
+       (title-short nil "ACS Nano")
+       (id nil "http://www.zotero.org/styles/acs-nano")
+       (link
+        ((href . "http://www.zotero.org/styles/acs-nano")
+         (rel . "self")))
+       (link
+        ((href . "http://www.zotero.org/styles/american-chemical-society-with-titles")
+         (rel . "template")))
+       (link
+        ((href . "http://pubs.acs.org/paragonplus/submission/ancac3/ancac3_authguide.pdf")
+         (rel . "documentation")))
+       (category
+        ((citation-format . "numeric")))
+       (category
+        ((field . "chemistry")))
+       (issn nil "1936-0851")
+       (eissn nil "1936-086X")
+       (summary nil "ACS style with et al in italics")
+       (updated nil "2014-09-21T00:39:49+00:00")
+       (rights
+        ((license . "http://creativecommons.org/licenses/by-sa/3.0/"))
+        "This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License")))
+#+END_SRC
+
+*** Macro nodes
+These seem to define inputs to a function that formats each field of an entry.
+
+#+BEGIN_SRC emacs-lisp
+(let (xml)
+  (setq xml (with-temp-buffer
+              (insert-file-contents "acs-nano.csl")
+              (libxml-parse-xml-region (point-min) (point-max))))
+  (xml-get-children xml 'macro))
+#+END_SRC
+
+#+RESULTS:
+#+BEGIN_SRC emacs-lisp
+((macro
+  ((name . "editor"))
+  (names
+   ((variable . "editor"))
+   (name
+    ((sort-separator . ", ")
+     (initialize-with . ". ")
+     (name-as-sort-order . "all")
+     (delimiter . "; ")
+     (delimiter-precedes-last . "always")))
+   (et-al
+    ((font-style . "italic")))
+   (label
+    ((form . "short")
+     (prefix . ", ")
+     (text-case . "capitalize-first")))))
+ (macro
+  ((name . "author"))
+  (names
+   ((variable . "author")
+    (suffix . "."))
+   (name
+    ((sort-separator . ", ")
+     (initialize-with . ". ")
+     (name-as-sort-order . "all")
+     (delimiter . "; ")
+     (delimiter-precedes-last . "always")))
+   (et-al
+    ((font-style . "italic")))
+   (label
+    ((form . "short")
+     (prefix . ", ")
+     (text-case . "capitalize-first")))))
+ (macro
+  ((name . "publisher"))
+  (group
+   ((delimiter . ": "))
+   (text
+    ((variable . "publisher")))
+   (text
+    ((variable . "publisher-place")))))
+ (macro
+  ((name . "title"))
+  (choose nil
+          (if
+              ((type . "bill book graphic legal_case legislation motion_picture report song")
+               (match . "any"))
+              (text
+               ((variable . "title")
+                (text-case . "title")
+                (font-style . "italic"))))
+          (else nil
+                (text
+                 ((variable . "title")
+                  (text-case . "title"))))))
+ (macro
+  ((name . "volume"))
+  (group
+   ((delimiter . " "))
+   (text
+    ((term . "volume")
+     (form . "short")
+     (text-case . "capitalize-first")))
+   (text
+    ((variable . "volume")))))
+ (macro
+  ((name . "series"))
+  (text
+   ((variable . "collection-title"))))
+ (macro
+  ((name . "pages"))
+  (label
+   ((variable . "page")
+    (form . "short")
+    (suffix . " ")))
+  (text
+   ((variable . "page"))))
+ (macro
+  ((name . "book-container"))
+  (group
+   ((delimiter . " "))
+   (text
+    ((macro . "title")
+     (suffix . ".")))
+   (text
+    ((term . "in")
+     (text-case . "capitalize-first")))
+   (text
+    ((variable . "container-title")
+     (font-style . "italic")))))
+ (macro
+  ((name . "issued"))
+  (date
+   ((variable . "issued")
+    (delimiter . " "))
+   (date-part
+    ((name . "year")))))
+ (macro
+  ((name . "full-issued"))
+  (date
+   ((variable . "issued")
+    (delimiter . " "))
+   (date-part
+    ((name . "month")
+     (form . "long")
+     (suffix . " ")))
+   (date-part
+    ((name . "day")
+     (suffix . ", ")))
+   (date-part
+    ((name . "year")))))
+ (macro
+  ((name . "edition"))
+  (choose nil
+          (if
+              ((is-numeric . "edition"))
+              (group
+               ((delimiter . " "))
+               (number
+                ((variable . "edition")
+                 (form . "ordinal")))
+               (text
+                ((term . "edition")
+                 (form . "short")))))
+          (else nil
+                (text
+                 ((variable . "edition")
+                  (suffix . ".")))))))
+#+END_SRC
+
+*** Citation overlay
+This seems to define the layout of a citation in the text, how they are sorted, collapsed, and delimited.
+
+#+BEGIN_SRC emacs-lisp
+,#+BEGIN_SRC emacs-lisp :results code
+(let (xml)
+  (setq xml (with-temp-buffer
+              (insert-file-contents "acs-nano.csl")
+              (libxml-parse-xml-region (point-min) (point-max))))
+  (xml-get-children xml 'citation))
+#+END_SRC
+
+#+RESULTS:
+#+BEGIN_SRC emacs-lisp
+((citation
+  ((collapse . "citation-number"))
+  (sort nil
+        (key
+         ((variable . "citation-number"))))
+  (layout
+   ((delimiter . ",")
+    (vertical-align . "sup"))
+   (text
+    ((variable . "citation-number"))))))
+#+END_SRC
+
+*** Bibliography
+
+This seems to layout how the bibliography is constructed.
+#+BEGIN_SRC emacs-lisp
+(let (xml)
+  (setq xml (with-temp-buffer
+              (insert-file-contents "acs-nano.csl")
+              (libxml-parse-xml-region (point-min) (point-max))))
+  (xml-get-children xml 'bibliography))
+#+END_SRC
+
+#+RESULTS:
+#+BEGIN_SRC emacs-lisp
+((bibliography
+  ((second-field-align . "flush")
+   (entry-spacing . "0")
+   (et-al-min . "11")
+   (et-al-use-first . "10"))
+  (layout
+   ((suffix . "."))
+   (text
+    ((variable . "citation-number")
+     (prefix . "(")
+     (suffix . ") ")))
+   (text
+    ((macro . "author")
+     (suffix . " ")))
+   (choose nil
+           (if
+               ((type . "article-magazine"))
+               (group
+                ((delimiter . " "))
+                (text
+                 ((macro . "title")
+                  (suffix . ".")))
+                (text
+                 ((variable . "container-title")
+                  (font-style . "italic")
+                  (suffix . ".")))
+                (text
+                 ((macro . "edition")))
+                (text
+                 ((macro . "publisher")))
+                (text
+                 ((macro . "full-issued")
+                  (suffix . ",")))
+                (text
+                 ((macro . "pages")))))
+           (else-if
+            ((type . "thesis"))
+            (group
+             ((delimiter . ", "))
+             (group
+              ((delimiter . ". "))
+              (text
+               ((macro . "title")))
+              (text
+               ((variable . "genre"))))
+             (text
+              ((macro . "publisher")))
+             (text
+              ((macro . "issued")))
+             (text
+              ((macro . "volume")))
+             (text
+              ((macro . "pages")))))
+           (else-if
+            ((type . "bill book graphic legal_case legislation motion_picture report song")
+             (match . "any"))
+            (group
+             ((delimiter . "; "))
+             (text
+              ((macro . "title")))
+             (text
+              ((macro . "editor")
+               (prefix . " ")))
+             (text
+              ((macro . "series")))
+             (text
+              ((macro . "edition")))
+             (choose nil
+                     (if
+                         ((type . "report"))
+                         (group
+                          ((delimiter . " "))
+                          (text
+                           ((variable . "genre")))
+                          (text
+                           ((variable . "number"))))))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "publisher")))
+              (text
+               ((macro . "issued"))))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "volume")))
+              (text
+               ((macro . "pages"))))))
+           (else-if
+            ((type . "patent"))
+            (group
+             ((delimiter . ", "))
+             (group
+              ((delimiter . ". "))
+              (text
+               ((macro . "title")))
+              (text
+               ((variable . "number"))))
+             (date
+              ((variable . "issued")
+               (form . "text")))))
+           (else-if
+            ((type . "chapter paper-conference")
+             (match . "any"))
+            (group
+             ((delimiter . "; "))
+             (text
+              ((macro . "book-container")))
+             (text
+              ((macro . "editor")))
+             (text
+              ((macro . "series")))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "publisher")))
+              (text
+               ((macro . "issued"))))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "volume")))
+              (text
+               ((macro . "pages"))))))
+           (else-if
+            ((type . "webpage"))
+            (group
+             ((delimiter . " "))
+             (text
+              ((variable . "title")))
+             (text
+              ((variable . "URL")))
+             (date
+              ((variable . "accessed")
+               (prefix . "(accessed ")
+               (suffix . ")")
+               (delimiter . " "))
+              (date-part
+               ((name . "month")
+                (form . "short")
+                (strip-periods . "true")))
+              (date-part
+               ((name . "day")
+                (suffix . ", ")))
+              (date-part
+               ((name . "year"))))))
+           (else-if
+            ((type . "article-journal"))
+            (group
+             ((delimiter . " "))
+             (text
+              ((macro . "title")
+               (suffix . ".")))
+             (text
+              ((variable . "container-title")
+               (font-style . "italic")
+               (form . "short")))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "issued")
+                (font-weight . "bold")))
+              (text
+               ((variable . "volume")
+                (font-style . "italic")))
+              (text
+               ((variable . "page"))))))
+           (else nil
+                 (group
+                  ((delimiter . ", "))
+                  (group
+                   ((delimiter . ". "))
+                   (text
+                    ((macro . "title")))
+                   (text
+                    ((variable . "container-title")
+                     (font-style . "italic"))))
+                  (group
+                   ((delimiter . ", "))
+                   (text
+                    ((macro . "issued")))
+                   (text
+                    ((variable . "volume")
+                     (font-style . "italic")))
+                   (text
+                    ((variable . "page"))))))))))
+#+END_SRC
+
+**** Layout of entry
+Here we get the layout of an entry.
+#+BEGIN_SRC emacs-lisp
+(let (xml)
+  (setq xml (with-temp-buffer
+              (insert-file-contents "acs-nano.csl")
+              (libxml-parse-xml-region (point-min) (point-max))))
+(car (xml-get-children  (car (xml-get-children xml 'bibliography)) 'layout)))
+#+END_SRC
+
+#+RESULTS:
+#+BEGIN_SRC emacs-lisp
+(layout
+ ((suffix . "."))
+ (text
+  ((variable . "citation-number")
+   (prefix . "(")
+   (suffix . ") ")))
+ (text
+  ((macro . "author")
+   (suffix . " ")))
+ (choose nil
+         (if
+             ((type . "article-magazine"))
+             (group
+              ((delimiter . " "))
+              (text
+               ((macro . "title")
+                (suffix . ".")))
+              (text
+               ((variable . "container-title")
+                (font-style . "italic")
+                (suffix . ".")))
+              (text
+               ((macro . "edition")))
+              (text
+               ((macro . "publisher")))
+              (text
+               ((macro . "full-issued")
+                (suffix . ",")))
+              (text
+               ((macro . "pages")))))
+         (else-if
+          ((type . "thesis"))
+          (group
+           ((delimiter . ", "))
+           (group
+            ((delimiter . ". "))
+            (text
+             ((macro . "title")))
+            (text
+             ((variable . "genre"))))
+           (text
+            ((macro . "publisher")))
+           (text
+            ((macro . "issued")))
+           (text
+            ((macro . "volume")))
+           (text
+            ((macro . "pages")))))
+         (else-if
+          ((type . "bill book graphic legal_case legislation motion_picture report song")
+           (match . "any"))
+          (group
+           ((delimiter . "; "))
+           (text
+            ((macro . "title")))
+           (text
+            ((macro . "editor")
+             (prefix . " ")))
+           (text
+            ((macro . "series")))
+           (text
+            ((macro . "edition")))
+           (choose nil
+                   (if
+                       ((type . "report"))
+                       (group
+                        ((delimiter . " "))
+                        (text
+                         ((variable . "genre")))
+                        (text
+                         ((variable . "number"))))))
+           (group
+            ((delimiter . ", "))
+            (text
+             ((macro . "publisher")))
+            (text
+             ((macro . "issued"))))
+           (group
+            ((delimiter . ", "))
+            (text
+             ((macro . "volume")))
+            (text
+             ((macro . "pages"))))))
+         (else-if
+          ((type . "patent"))
+          (group
+           ((delimiter . ", "))
+           (group
+            ((delimiter . ". "))
+            (text
+             ((macro . "title")))
+            (text
+             ((variable . "number"))))
+           (date
+            ((variable . "issued")
+             (form . "text")))))
+         (else-if
+          ((type . "chapter paper-conference")
+           (match . "any"))
+          (group
+           ((delimiter . "; "))
+           (text
+            ((macro . "book-container")))
+           (text
+            ((macro . "editor")))
+           (text
+            ((macro . "series")))
+           (group
+            ((delimiter . ", "))
+            (text
+             ((macro . "publisher")))
+            (text
+             ((macro . "issued"))))
+           (group
+            ((delimiter . ", "))
+            (text
+             ((macro . "volume")))
+            (text
+             ((macro . "pages"))))))
+         (else-if
+          ((type . "webpage"))
+          (group
+           ((delimiter . " "))
+           (text
+            ((variable . "title")))
+           (text
+            ((variable . "URL")))
+           (date
+            ((variable . "accessed")
+             (prefix . "(accessed ")
+             (suffix . ")")
+             (delimiter . " "))
+            (date-part
+             ((name . "month")
+              (form . "short")
+              (strip-periods . "true")))
+            (date-part
+             ((name . "day")
+              (suffix . ", ")))
+            (date-part
+             ((name . "year"))))))
+         (else-if
+          ((type . "article-journal"))
+          (group
+           ((delimiter . " "))
+           (text
+            ((macro . "title")
+             (suffix . ".")))
+           (text
+            ((variable . "container-title")
+             (font-style . "italic")
+             (form . "short")))
+           (group
+            ((delimiter . ", "))
+            (text
+             ((macro . "issued")
+              (font-weight . "bold")))
+            (text
+             ((variable . "volume")
+              (font-style . "italic")))
+            (text
+             ((variable . "page"))))))
+         (else nil
+               (group
+                ((delimiter . ", "))
+                (group
+                 ((delimiter . ". "))
+                 (text
+                  ((macro . "title")))
+                 (text
+                  ((variable . "container-title")
+                   (font-style . "italic"))))
+                (group
+                 ((delimiter . ", "))
+                 (text
+                  ((macro . "issued")))
+                 (text
+                  ((variable . "volume")
+                   (font-style . "italic")))
+                 (text
+                  ((variable . "page"))))))))
+#+END_SRC
+
+#+END_SRC
+*** An overview of a CSL for ACS Nano
+#+BEGIN_SRC emacs-lisp
+(with-temp-buffer
+  (insert-file-contents "acs-nano.csl")
+  (libxml-parse-xml-region (point-min) (point-max)))
+#+END_SRC
+
+#+RESULTS:
+#+BEGIN_SRC emacs-lisp
+(style
+ ((class . "in-text")
+  (version . "1.0")
+  (demote-non-dropping-particle . "sort-only")
+  (page-range-format . "expanded")
+  (default-locale . "en-US"))
+ (info nil
+       (title nil "ACS Nano")
+       (title-short nil "ACS Nano")
+       (id nil "http://www.zotero.org/styles/acs-nano")
+       (link
+        ((href . "http://www.zotero.org/styles/acs-nano")
+         (rel . "self")))
+       (link
+        ((href . "http://www.zotero.org/styles/american-chemical-society-with-titles")
+         (rel . "template")))
+       (link
+        ((href . "http://pubs.acs.org/paragonplus/submission/ancac3/ancac3_authguide.pdf")
+         (rel . "documentation")))
+       (category
+        ((citation-format . "numeric")))
+       (category
+        ((field . "chemistry")))
+       (issn nil "1936-0851")
+       (eissn nil "1936-086X")
+       (summary nil "ACS style with et al in italics")
+       (updated nil "2014-09-21T00:39:49+00:00")
+       (rights
+        ((license . "http://creativecommons.org/licenses/by-sa/3.0/"))
+        "This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License"))
+ (macro
+  ((name . "editor"))
+  (names
+   ((variable . "editor"))
+   (name
+    ((sort-separator . ", ")
+     (initialize-with . ". ")
+     (name-as-sort-order . "all")
+     (delimiter . "; ")
+     (delimiter-precedes-last . "always")))
+   (et-al
+    ((font-style . "italic")))
+   (label
+    ((form . "short")
+     (prefix . ", ")
+     (text-case . "capitalize-first")))))
+ (macro
+  ((name . "author"))
+  (names
+   ((variable . "author")
+    (suffix . "."))
+   (name
+    ((sort-separator . ", ")
+     (initialize-with . ". ")
+     (name-as-sort-order . "all")
+     (delimiter . "; ")
+     (delimiter-precedes-last . "always")))
+   (et-al
+    ((font-style . "italic")))
+   (label
+    ((form . "short")
+     (prefix . ", ")
+     (text-case . "capitalize-first")))))
+ (macro
+  ((name . "publisher"))
+  (group
+   ((delimiter . ": "))
+   (text
+    ((variable . "publisher")))
+   (text
+    ((variable . "publisher-place")))))
+ (macro
+  ((name . "title"))
+  (choose nil
+          (if
+              ((type . "bill book graphic legal_case legislation motion_picture report song")
+               (match . "any"))
+              (text
+               ((variable . "title")
+                (text-case . "title")
+                (font-style . "italic"))))
+          (else nil
+                (text
+                 ((variable . "title")
+                  (text-case . "title"))))))
+ (macro
+  ((name . "volume"))
+  (group
+   ((delimiter . " "))
+   (text
+    ((term . "volume")
+     (form . "short")
+     (text-case . "capitalize-first")))
+   (text
+    ((variable . "volume")))))
+ (macro
+  ((name . "series"))
+  (text
+   ((variable . "collection-title"))))
+ (macro
+  ((name . "pages"))
+  (label
+   ((variable . "page")
+    (form . "short")
+    (suffix . " ")))
+  (text
+   ((variable . "page"))))
+ (macro
+  ((name . "book-container"))
+  (group
+   ((delimiter . " "))
+   (text
+    ((macro . "title")
+     (suffix . ".")))
+   (text
+    ((term . "in")
+     (text-case . "capitalize-first")))
+   (text
+    ((variable . "container-title")
+     (font-style . "italic")))))
+ (macro
+  ((name . "issued"))
+  (date
+   ((variable . "issued")
+    (delimiter . " "))
+   (date-part
+    ((name . "year")))))
+ (macro
+  ((name . "full-issued"))
+  (date
+   ((variable . "issued")
+    (delimiter . " "))
+   (date-part
+    ((name . "month")
+     (form . "long")
+     (suffix . " ")))
+   (date-part
+    ((name . "day")
+     (suffix . ", ")))
+   (date-part
+    ((name . "year")))))
+ (macro
+  ((name . "edition"))
+  (choose nil
+          (if
+              ((is-numeric . "edition"))
+              (group
+               ((delimiter . " "))
+               (number
+                ((variable . "edition")
+                 (form . "ordinal")))
+               (text
+                ((term . "edition")
+                 (form . "short")))))
+          (else nil
+                (text
+                 ((variable . "edition")
+                  (suffix . "."))))))
+ (citation
+  ((collapse . "citation-number"))
+  (sort nil
+        (key
+         ((variable . "citation-number"))))
+  (layout
+   ((delimiter . ",")
+    (vertical-align . "sup"))
+   (text
+    ((variable . "citation-number")))))
+ (bibliography
+  ((second-field-align . "flush")
+   (entry-spacing . "0")
+   (et-al-min . "11")
+   (et-al-use-first . "10"))
+  (layout
+   ((suffix . "."))
+   (text
+    ((variable . "citation-number")
+     (prefix . "(")
+     (suffix . ") ")))
+   (text
+    ((macro . "author")
+     (suffix . " ")))
+   (choose nil
+           (if
+               ((type . "article-magazine"))
+               (group
+                ((delimiter . " "))
+                (text
+                 ((macro . "title")
+                  (suffix . ".")))
+                (text
+                 ((variable . "container-title")
+                  (font-style . "italic")
+                  (suffix . ".")))
+                (text
+                 ((macro . "edition")))
+                (text
+                 ((macro . "publisher")))
+                (text
+                 ((macro . "full-issued")
+                  (suffix . ",")))
+                (text
+                 ((macro . "pages")))))
+           (else-if
+            ((type . "thesis"))
+            (group
+             ((delimiter . ", "))
+             (group
+              ((delimiter . ". "))
+              (text
+               ((macro . "title")))
+              (text
+               ((variable . "genre"))))
+             (text
+              ((macro . "publisher")))
+             (text
+              ((macro . "issued")))
+             (text
+              ((macro . "volume")))
+             (text
+              ((macro . "pages")))))
+           (else-if
+            ((type . "bill book graphic legal_case legislation motion_picture report song")
+             (match . "any"))
+            (group
+             ((delimiter . "; "))
+             (text
+              ((macro . "title")))
+             (text
+              ((macro . "editor")
+               (prefix . " ")))
+             (text
+              ((macro . "series")))
+             (text
+              ((macro . "edition")))
+             (choose nil
+                     (if
+                         ((type . "report"))
+                         (group
+                          ((delimiter . " "))
+                          (text
+                           ((variable . "genre")))
+                          (text
+                           ((variable . "number"))))))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "publisher")))
+              (text
+               ((macro . "issued"))))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "volume")))
+              (text
+               ((macro . "pages"))))))
+           (else-if
+            ((type . "patent"))
+            (group
+             ((delimiter . ", "))
+             (group
+              ((delimiter . ". "))
+              (text
+               ((macro . "title")))
+              (text
+               ((variable . "number"))))
+             (date
+              ((variable . "issued")
+               (form . "text")))))
+           (else-if
+            ((type . "chapter paper-conference")
+             (match . "any"))
+            (group
+             ((delimiter . "; "))
+             (text
+              ((macro . "book-container")))
+             (text
+              ((macro . "editor")))
+             (text
+              ((macro . "series")))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "publisher")))
+              (text
+               ((macro . "issued"))))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "volume")))
+              (text
+               ((macro . "pages"))))))
+           (else-if
+            ((type . "webpage"))
+            (group
+             ((delimiter . " "))
+             (text
+              ((variable . "title")))
+             (text
+              ((variable . "URL")))
+             (date
+              ((variable . "accessed")
+               (prefix . "(accessed ")
+               (suffix . ")")
+               (delimiter . " "))
+              (date-part
+               ((name . "month")
+                (form . "short")
+                (strip-periods . "true")))
+              (date-part
+               ((name . "day")
+                (suffix . ", ")))
+              (date-part
+               ((name . "year"))))))
+           (else-if
+            ((type . "article-journal"))
+            (group
+             ((delimiter . " "))
+             (text
+              ((macro . "title")
+               (suffix . ".")))
+             (text
+              ((variable . "container-title")
+               (font-style . "italic")
+               (form . "short")))
+             (group
+              ((delimiter . ", "))
+              (text
+               ((macro . "issued")
+                (font-weight . "bold")))
+              (text
+               ((variable . "volume")
+                (font-style . "italic")))
+              (text
+               ((variable . "page"))))))
+           (else nil
+                 (group
+                  ((delimiter . ", "))
+                  (group
+                   ((delimiter . ". "))
+                   (text
+                    ((macro . "title")))
+                   (text
+                    ((variable . "container-title")
+                     (font-style . "italic"))))
+                  (group
+                   ((delimiter . ", "))
+                   (text
+                    ((macro . "issued")))
+                   (text
+                    ((variable . "volume")
+                     (font-style . "italic")))
+                   (text
+                    ((variable . "page"))))))))))
+#+END_SRC
+** Working example
+
+#+BEGIN_SRC emacs-lisp
+(add-to-list 'load-path ".")
+(require 'org-ref-citeproc)
+(require 'unsrt)
+#+END_SRC
+
+#+RESULTS:
+: unsrt
+
+My data cite:kitchin-2015-examp in Ref. citenum:kitchin-2015-data-surfac-scien.
+
+A multicite cite:kitchin-2015-examp,kitchin-2015-data-surfac-scien
+
+*** Getting the citations
+#+BEGIN_SRC emacs-lisp
+(mapcar
+ (lambda (link)
+   (org-element-property :type link))
+ (orcp-collect-citations))
+#+END_SRC
+
+#+RESULTS:
+| cite | citenum | cite |
+
+
+I need a key to entry function
+#+BEGIN_SRC emacs-lisp
+(orcp-key-to-entry "kitchin-2015-examp")
+#+END_SRC
+
+#+RESULTS:
+#+BEGIN_SRC emacs-lisp
+(("=type=" . "article")
+ ("=key=" . "kitchin-2015-examp")
+ ("author" . "Kitchin, John R.")
+ ("title" . "Examples of Effective Data Sharing in Scientific Publishing")
+ ("journal" . "ACS Catalysis")
+ ("volume" . "5")
+ ("number" . "6")
+ ("pages" . "3894-3899")
+ ("year" . "2015")
+ ("doi" . "10.1021/acscatal.5b00538")
+ ("url" . " http://dx.doi.org/10.1021/acscatal.5b00538 ")
+ ("keywords" . "DESC0004031, early-career, orgmode, Data sharing ")
+ ("eprint" . " http://dx.doi.org/10.1021/acscatal.5b00538 "))
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp
+(cdr (assoc "year" (orcp-key-to-entry "kitchin-2015-examp")))
+#+END_SRC
+
+#+RESULTS:
+: 2015
+
+cite:wang-2013-immob-co2
+
+cite:antony-2012-pathw-c
+
+cite:weaver-2011-high-selec
+
+*** Sorting the entries
+The unique entries will make up the bibliography. They might get sorted in a variety of ways, e.g. unsorted, alphabetically, by year, etc...
+#+BEGIN_SRC emacs-lisp
+(orcp-sort-entries-increasing-year (orcp-collect-unique-entries))
+#+END_SRC
+
+#+RESULTS:
+| weaver-2011-high-selec         | (=type= . article) | (=key= . weaver-2011-high-selec)         | (author . Jason F. Weaver and Can Hakanoglu and Abbin Antony and Aravind\n                  Asthagiri)            | (title . High Selectivity for Primary {C-H} Bond Cleavage of Propane\n                  $\sigma$-complexes on the {PdO}(101) Surface)   | (keywords . alkane)           | (journal . J. Am. Chem. Soc.)       | (volume . 133) | (number . 40)       | (pages . 16196-16200)              | (year . 2011)                                                              | (doi . 10.1021/ja206599k)                            | (url . http://dx.doi.org/10.1021/ja206599k)                    | (date_added . Sat Nov 28 09:10:59 2015)                 |
+| antony-2012-pathw-c            | (=type= . article) | (=key= . antony-2012-pathw-c)            | (author . Abbin Antony and Aravind Asthagiri and Jason F. Weaver)                                                 | (title . Pathways for {C-H} Bond Cleavage of Propane $\sigma$-complexes on\n                  {PdO}(101))                               | (keywords . alkane)           | (journal . Phys. Chem. Chem. Phys.) | (volume . 14)  | (number . 35)       | (pages . 12202)                    | (year . 2012)                                                              | (doi . 10.1039/c2cp41900a)                           | (url . http://dx.doi.org/10.1039/c2cp41900a)                   | (date_added . Sat Nov 28 09:13:32 2015)                 |
+| wang-2013-immob-co2            | (=type= . article) | (=key= . wang-2013-immob-co2)            | (author . Xianfeng Wang and Novruz G. Akhmedov and Yuhua Duan and David\n                  Luebke and Bingyun Li) | (title . Immobilization of Amino Acid Ionic Liquids Into Nanoporous\n                  Microspheres As Robust Sorbents for Co2 Capture) | (journal . J. Mater. Chem. A) | (volume . 1)                        | (number . 9)   | (pages . 2978)      | (year . 2013)                      | (doi . 10.1039/c3ta00768e)                                                 | (url . http://dx.doi.org/10.1039/C3TA00768E)         | (date_added . Thu Dec 3 06:13:09 2015)                         |                                                         |
+| kitchin-2015-examp             | (=type= . article) | (=key= . kitchin-2015-examp)             | (author . Kitchin, John R.)                                                                                       | (title . Examples of Effective Data Sharing in Scientific Publishing)                                                                   | (journal . ACS Catalysis)     | (volume . 5)                        | (number . 6)   | (pages . 3894-3899) | (year . 2015)                      | (doi . 10.1021/acscatal.5b00538)                                           | (url .  http://dx.doi.org/10.1021/acscatal.5b00538 ) | (keywords . DESC0004031, early-career, orgmode, Data sharing ) | (eprint .  http://dx.doi.org/10.1021/acscatal.5b00538 ) |
+| kitchin-2015-data-surfac-scien | (=type= . article) | (=key= . kitchin-2015-data-surfac-scien) | (author . John R. Kitchin)                                                                                        | (title . Data Sharing in Surface Science)                                                                                               | (journal . Surface Science )  | (number . 0)                        | (pages .  - )  | (year . 2015)       | (doi . 10.1016/j.susc.2015.05.007) | (url . http://www.sciencedirect.com/science/article/pii/S0039602815001326) | (issn . 0039-6028)                                   | (keywords . DESC0004031, early-career, orgmode, Data sharing ) |                                                         |
+
+cite:anderson-1977-raman
+
+#+BEGIN_SRC emacs-lisp
+(orcp-sort-entries-alphabetical (orcp-collect-unique-entries))
+#+END_SRC
+
+#+RESULTS:
+| anderson-1977-raman            | (=type= . article) | (=key= . anderson-1977-raman)            | (author . George R. Anderson)                                                                                     | (title . The {R}aman Spectra of Carbon Dioxide in Liquid Water and\n                  Water-D2)                                         | (journal . J. Phys. Chem.)    | (volume . 81)                       | (number . 3)   | (pages . 273-276)   | (year . 1977)                      | (doi . 10.1021/j100518a017)                                                | (url . http://dx.doi.org/10.1021/j100518a017)        | (month . 2)                                                    | (eprint . http://pubs.acs.org/doi/pdf/10.1021/j100518a017) |
+| antony-2012-pathw-c            | (=type= . article) | (=key= . antony-2012-pathw-c)            | (author . Abbin Antony and Aravind Asthagiri and Jason F. Weaver)                                                 | (title . Pathways for {C-H} Bond Cleavage of Propane $\sigma$-complexes on\n                  {PdO}(101))                               | (keywords . alkane)           | (journal . Phys. Chem. Chem. Phys.) | (volume . 14)  | (number . 35)       | (pages . 12202)                    | (year . 2012)                                                              | (doi . 10.1039/c2cp41900a)                           | (url . http://dx.doi.org/10.1039/c2cp41900a)                   | (date_added . Sat Nov 28 09:13:32 2015)                    |
+| kitchin-2015-examp             | (=type= . article) | (=key= . kitchin-2015-examp)             | (author . Kitchin, John R.)                                                                                       | (title . Examples of Effective Data Sharing in Scientific Publishing)                                                                   | (journal . ACS Catalysis)     | (volume . 5)                        | (number . 6)   | (pages . 3894-3899) | (year . 2015)                      | (doi . 10.1021/acscatal.5b00538)                                           | (url .  http://dx.doi.org/10.1021/acscatal.5b00538 ) | (keywords . DESC0004031, early-career, orgmode, Data sharing ) | (eprint .  http://dx.doi.org/10.1021/acscatal.5b00538 )    |
+| kitchin-2015-data-surfac-scien | (=type= . article) | (=key= . kitchin-2015-data-surfac-scien) | (author . John R. Kitchin)                                                                                        | (title . Data Sharing in Surface Science)                                                                                               | (journal . Surface Science )  | (number . 0)                        | (pages .  - )  | (year . 2015)       | (doi . 10.1016/j.susc.2015.05.007) | (url . http://www.sciencedirect.com/science/article/pii/S0039602815001326) | (issn . 0039-6028)                                   | (keywords . DESC0004031, early-career, orgmode, Data sharing ) |                                                            |
+| wang-2013-immob-co2            | (=type= . article) | (=key= . wang-2013-immob-co2)            | (author . Xianfeng Wang and Novruz G. Akhmedov and Yuhua Duan and David\n                  Luebke and Bingyun Li) | (title . Immobilization of Amino Acid Ionic Liquids Into Nanoporous\n                  Microspheres As Robust Sorbents for Co2 Capture) | (journal . J. Mater. Chem. A) | (volume . 1)                        | (number . 9)   | (pages . 2978)      | (year . 2013)                      | (doi . 10.1039/c3ta00768e)                                                 | (url . http://dx.doi.org/10.1039/C3TA00768E)         | (date_added . Thu Dec 3 06:13:09 2015)                         |                                                            |
+| weaver-2011-high-selec         | (=type= . article) | (=key= . weaver-2011-high-selec)         | (author . Jason F. Weaver and Can Hakanoglu and Abbin Antony and Aravind\n                  Asthagiri)            | (title . High Selectivity for Primary {C-H} Bond Cleavage of Propane\n                  $\sigma$-complexes on the {PdO}(101) Surface)   | (keywords . alkane)           | (journal . J. Am. Chem. Soc.)       | (volume . 133) | (number . 40)       | (pages . 16196-16200)              | (year . 2011)                                                              | (doi . 10.1021/ja206599k)                            | (url . http://dx.doi.org/10.1021/ja206599k)                    | (date_added . Sat Nov 28 09:10:59 2015)                    |
+
+*** Getting a citation replacement
+This will be taking a key, and the unique replacements, and computing a replacement for that key.
+
+#+BEGIN_SRC emacs-lisp
+(orcp-citation-author-year-label
+ "anderson-1977-raman"
+ (orcp-sort-entries-alphabetical (orcp-collect-unique-entries)))
+#+END_SRC
+
+#+RESULTS:
+: Anderson 1977
+
+citeauthor:wang-2013-immob-co2
+
+citeyear:wang-2013-immob-co2
+
+#+BEGIN_SRC emacs-lisp
+(orcp-get-citation-style 'vertical-align 'citenum)
+
+(cdr (assoc 'vertical-align (cdr (assoc 'citenum citation-style))))
+#+END_SRC
+
+#+RESULTS:
+: baseline
+
+#+BEGIN_SRC emacs-lisp
+(setq orcp-unique-bibliography-links (orcp-collect-unique-entries))
+
+(mapcar
+ (lambda (link)
+   (list
+    (org-element-property :type link)
+    (orcp-get-text-replacement link)) )
+ (orcp-collect-citations))
+#+END_SRC
+
+#+RESULTS:
+| cite       | {}^{1}   |
+| citenum    | 2        |
+| cite       | {}^{1,2} |
+| cite       | {}^{3}   |
+| cite       | {}^{4}   |
+| cite       | {}^{5}   |
+| cite       | {}^{6}   |
+| citeauthor | Wang     |
+| citeyear   | 2013     |
+
+
+#+BEGIN_SRC emacs-lisp
+(orcp-author (nth 3 (orcp-collect-unique-entries)))
+#+END_SRC
+
+#+RESULTS:
+: Antony, Abbin; Asthagiri, Aravind and Weaver, Jason F..
+
+
+#+BEGIN_SRC emacs-lisp
+(let ((entry (nth 3 (orcp-collect-unique-entries))))
+  (concat
+   (orcp-author entry)
+   (orcp-title entry)
+   (orcp-journal entry)
+   (orcp-volume entry)
+   (orcp-pages entry)
+   (orcp-year entry)
+   (orcp-doi entry)))
+#+END_SRC
+
+#+RESULTS:
+: Antony, Abbin; Asthagiri, Aravind and Weaver, Jason F., /Pathways for {C-H} Bond Cleavage of Propane $\sigma$-complexes on {PdO}(101)/, Phys. Chem. Chem. Phys., 14*(35)*, pp. 12202 (2012).doi:10.1039/c2cp41900a.
+
+#+BEGIN_SRC emacs-lisp
+(mapconcat 'identity (cl-loop for entry in (orcp-collect-unique-entries)
+                           collect
+                           (concat
+                            (orcp-author entry)
+                            (orcp-title entry)
+                            (orcp-journal entry)
+                            (orcp-volume entry)
+                            (orcp-pages entry)
+                            (orcp-year entry)
+                            (orcp-doi entry)))
+           "\n\n")
+#+END_SRC
+
+#+RESULTS:
+#+begin_example
+Kitchin,  John R., /Examples of Effective Data Sharing in Scientific Publishing/, ACS Catalysis, 5*(6)*, pp. 3894-3899 (2015). doi:10.1021/acscatal.5b00538.
+
+Kitchin, John R., /Data Sharing in Surface Science/, Surface Science , *(0)*, pp.  -  (2015). doi:10.1016/j.susc.2015.05.007.
+
+Wang, Xianfeng; Akhmedov, Novruz G.; Duan, Yuhua; Luebke, David and Li, Bingyun, /Immobilization of Amino Acid Ionic Liquids Into Nanoporous Microspheres As Robust Sorbents for Co2 Capture/, J. Mater. Chem. A, 1*(9)*, pp. 2978 (2013). doi:10.1039/c3ta00768e.
+
+Antony, Abbin; Asthagiri, Aravind and Weaver, Jason F., /Pathways for {C-H} Bond Cleavage of Propane $\sigma$-complexes on {PdO}(101)/, Phys. Chem. Chem. Phys., 14*(35)*, pp. 12202 (2012). doi:10.1039/c2cp41900a.
+
+Weaver, Jason F.; Hakanoglu, Can; Antony, Abbin and Asthagiri, Aravind, /High Selectivity for Primary {C-H} Bond Cleavage of Propane $\sigma$-complexes on the {PdO}(101) Surface/, J. Am. Chem. Soc., 133*(40)*, pp. 16196-16200 (2011). doi:10.1021/ja206599k.
+
+Anderson, George R., /The {R}aman Spectra of Carbon Dioxide in Liquid Water and Water-D2/, J. Phys. Chem., 81*(3)*, pp. 273-276 (1977). doi:10.1021/j100518a017.
+
+Zhu,  Qingjun; Wegener,  Staci L.; Xie,  Chao; Uche,  Obioma; Neurock,  Matthew and Marks,  Tobin J., /Sulfur As a Selective "soft" Oxidant for Catalytic Methane Conversion Probed By Experiment and Theory/, Nature chemistry, 5, pp. 104-109 (2013). doi:10.1002/ange.201311111.
+
+Lizzit, S.; Baraldi, A.; Groso, A.; Reuter, K.; Ganduglia-Pirovano, M. V.; Stampfl, C.; Scheffler, M.; Stichler, M.; Keller, C.; Wurth, W. and Menzel, D., /Surface Core-Level Shifts of Clean and Oxygen-Covered {Ru}(0001)/, Phys. Rev. B, 63*(20)*, pp. 205419 (2001). doi:10.1103/physrevb.63.205419.
+#+end_example
+
+
+cite:zhu-2013-sulfur,lizzit-2001-surfac-ru
+
+cite:yeo-2012-in-situ,ye-2012-proces-charac
+#+BEGIN_SRC emacs-lisp
+(orcp-formatted-bibliography)
+#+END_SRC
+
+#+RESULTS:
+#+begin_example
+1.  Kitchin,  John  R.,  /Examples  of   Effective  Data  Sharing  in  Scientific
+   Publishing/,    ACS     Catalysis,    5*(6)*,    pp.     3894-3899    (2015).
+   doi:10.1021/acscatal.5b00538.
+
+2.  Kitchin, John R., /Data Sharing in Surface Science/, Surface Science , *(0)*,
+   pp. - (2015). doi:10.1016/j.susc.2015.05.007.
+
+3.  Wang,  Xianfeng; Akhmedov,  Novruz G.;  Duan,  Yuhua; Luebke,  David and  Li,
+   Bingyun,  /Immobilization  of  Amino   Acid  Ionic  Liquids  Into  Nanoporous
+   Microspheres As Robust Sorbents for Co2  Capture/, J. Mater. Chem. A, 1*(9)*,
+   pp. 2978 (2013). doi:10.1039/c3ta00768e.
+
+4.  Antony, Abbin; Asthagiri,  Aravind and Weaver, Jason F.,  /Pathways for {C-H}
+   Bond Cleavage of Propane $\sigma$-complexes on {PdO}(101)/, Phys. Chem. Chem.
+   Phys., 14*(35)*, pp. 12202 (2012). doi:10.1039/c2cp41900a.
+
+5.  Weaver, Jason F.; Hakanoglu, Can; Antony, Abbin and Asthagiri, Aravind, /High
+   Selectivity for Primary {C-H} Bond  Cleavage of Propane $\sigma$-complexes on
+   the  {PdO}(101)  Surface/, J.  Am.  Chem.  Soc., 133*(40)*,  pp.  16196-16200
+   (2011). doi:10.1021/ja206599k.
+
+6.  Anderson, George R.,  /The {R}aman Spectra of Carbon Dioxide  in Liquid Water
+   and   Water-D2/,    J.   Phys.   Chem.,   81*(3)*,    pp.   273-276   (1977).
+   doi:10.1021/j100518a017.
+
+7.  Zhu, Qingjun;  Wegener, Staci L.;  Xie, Chao; Uche, Obioma;  Neurock, Matthew
+   and Marks,  Tobin J.,  /Sulfur As  a Selective  "soft" Oxidant  for Catalytic
+   Methane Conversion Probed By Experiment and Theory/, Nature chemistry, 5, pp.
+   104-109 (2013). doi:10.1002/ange.201311111.
+
+8.  Lizzit, S.;  Baraldi, A.; Groso,  A.; Reuter, K.; Ganduglia-Pirovano,  M. V.;
+   Stampfl, C.; Scheffler,  M.; Stichler, M.; Keller, C.; Wurth,  W. and Menzel,
+   D., /Surface Core-Level Shifts of Clean and Oxygen-Covered {Ru}(0001)/, Phys.
+   Rev. B, 63*(20)*, pp. 205419 (2001). doi:10.1103/physrevb.63.205419.
+
+9.  Yeo, Boon Siang and  Bell, Alexis T., /In Situ {R}aman  Study of Nickel Oxide
+   and Gold-Supported  Nickel Oxide Catalysts for  the Electrochemical Evolution
+   of Oxygen/,  The Journal  of Physical Chemistry  C, 116*(15)*,  pp. 8394-8400
+   (2012). doi:10.1021/jp3007415.
+
+10. Chunbo, Y.  E.; CHEN,  Guangwen and YUAN,  Quan, /Process  Characteristics of
+   \ce{CO2} Absorption  By Aqueous Monoethanolamine in  a Microchannel Reactor/,
+   Chinese  Journal  of  Chemical  Engineering,  20*(1)*,  pp.  111-119  (2012).
+   doi:10.1016/s1004-9541(12)60370-x.
+
+11. Kittel, Charles, /Introduction to Solid State Physics/, (2005).
+#+end_example
+
+
+
+
+cite:kittel-2005-introd-solid
+
+
+
+*** Reading my csl
+#+BEGIN_SRC emacs-lisp
+(require 'unsrt)
+(assoc 'sort bibliography-style)
+#+END_SRC
+
+#+RESULTS:
+| sort | quote | citation-number |
+
+
+**
+
+** Putting it together
+You run these to get the replacements
+
+#+BEGIN_SRC emacs-lisp
+(orcp-collect-citations)
+(orcp-collect-unique-entries)
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp
+(cl-loop for link in *orcp-citation-links*
+      for repl in (orcp-get-citation-replacements)
+      collect
+      (list repl
+            (org-element-property :begin link)
+            (org-element-property :end link)))
+#+END_SRC
+
+#+RESULTS:
+| {}^{1}    | 29467 | 29491 |
+| 2         | 29499 | 29537 |
+| {}^{1,2}  | 29552 | 29606 |
+| {}^{3}    | 30578 | 30602 |
+| {}^{4}    | 30604 | 30628 |
+| {}^{5}    | 30630 | 30657 |
+| {}^{6}    | 34705 | 34729 |
+| Wang      | 39698 | 39728 |
+| 2013      | 39730 | 39758 |
+| {}^{7,8}  | 43188 | 43230 |
+| {}^{9,10} | 43232 | 43275 |
+| {}^{11}   | 45939 | 45968 |
+
+#+BEGIN_SRC emacs-lisp
+(orcp-formatted-bibliography)
+#+END_SRC
+
+#+RESULTS:
+#+begin_example
+1.  Kitchin,  John  R.,  /Examples  of   Effective  Data  Sharing  in  Scientific
+   Publishing/,    ACS     Catalysis,    5*(6)*,    pp.     3894-3899    (2015).
+   doi:10.1021/acscatal.5b00538.
+
+2.  Kitchin, John R., /Data Sharing in Surface Science/, Surface Science , *(0)*,
+   pp. - (2015). doi:10.1016/j.susc.2015.05.007.
+
+3.  Wang,  Xianfeng; Akhmedov,  Novruz G.;  Duan,  Yuhua; Luebke,  David and  Li,
+   Bingyun,  /Immobilization  of  Amino   Acid  Ionic  Liquids  Into  Nanoporous
+   Microspheres As Robust Sorbents for Co2  Capture/, J. Mater. Chem. A, 1*(9)*,
+   pp. 2978 (2013). doi:10.1039/c3ta00768e.
+
+4.  Antony, Abbin; Asthagiri,  Aravind and Weaver, Jason F.,  /Pathways for {C-H}
+   Bond Cleavage of Propane $\sigma$-complexes on {PdO}(101)/, Phys. Chem. Chem.
+   Phys., 14*(35)*, pp. 12202 (2012). doi:10.1039/c2cp41900a.
+
+5.  Weaver, Jason F.; Hakanoglu, Can; Antony, Abbin and Asthagiri, Aravind, /High
+   Selectivity for Primary {C-H} Bond  Cleavage of Propane $\sigma$-complexes on
+   the  {PdO}(101)  Surface/, J.  Am.  Chem.  Soc., 133*(40)*,  pp.  16196-16200
+   (2011). doi:10.1021/ja206599k.
+
+6.  Anderson, George R.,  /The {R}aman Spectra of Carbon Dioxide  in Liquid Water
+   and   Water-D2/,    J.   Phys.   Chem.,   81*(3)*,    pp.   273-276   (1977).
+   doi:10.1021/j100518a017.
+
+7.  Zhu, Qingjun;  Wegener, Staci L.;  Xie, Chao; Uche, Obioma;  Neurock, Matthew
+   and Marks,  Tobin J.,  /Sulfur As  a Selective  "soft" Oxidant  for Catalytic
+   Methane Conversion Probed By Experiment and Theory/, Nature chemistry, 5, pp.
+   104-109 (2013). doi:10.1002/ange.201311111.
+
+8.  Lizzit, S.;  Baraldi, A.; Groso,  A.; Reuter, K.; Ganduglia-Pirovano,  M. V.;
+   Stampfl, C.; Scheffler,  M.; Stichler, M.; Keller, C.; Wurth,  W. and Menzel,
+   D., /Surface Core-Level Shifts of Clean and Oxygen-Covered {Ru}(0001)/, Phys.
+   Rev. B, 63*(20)*, pp. 205419 (2001). doi:10.1103/physrevb.63.205419.
+
+9.  Yeo, Boon Siang and  Bell, Alexis T., /In Situ {R}aman  Study of Nickel Oxide
+   and Gold-Supported  Nickel Oxide Catalysts for  the Electrochemical Evolution
+   of Oxygen/,  The Journal  of Physical Chemistry  C, 116*(15)*,  pp. 8394-8400
+   (2012). doi:10.1021/jp3007415.
+
+10. Chunbo, Y.  E.; CHEN,  Guangwen and YUAN,  Quan, /Process  Characteristics of
+   \ce{CO2} Absorption  By Aqueous Monoethanolamine in  a Microchannel Reactor/,
+   Chinese  Journal  of  Chemical  Engineering,  20*(1)*,  pp.  111-119  (2012).
+   doi:10.1016/s1004-9541(12)60370-x.
+
+11. Kittel, Charles, /Introduction to Solid State Physics/, (2005).
+#+end_example
+
+
+
+#+BEGIN_SRC emacs-lisp
+(cl-loop for link in (org-element-map
+                        (org-element-parse-buffer) 'link 'identity)
+        if (string= "bibliographystyle"
+                    (org-element-property :type link))
+        do
+        ;; get path for style
+        (let ((style (intern (org-element-property :path link)))))
+        (load-library style)
+        )
+#+END_SRC
diff --git a/elpa/org-ref-20191023.117/doi-utils.el b/elpa/org-ref-20191023.117/doi-utils.el
new file mode 100644
index 00000000..3f1e2897
--- /dev/null
+++ b/elpa/org-ref-20191023.117/doi-utils.el
@@ -0,0 +1,1522 @@
+;;; doi-utils.el --- DOI utilities for making bibtex entries
+
+;; Copyright (C) 2015  John Kitchin
+
+;; Author: John Kitchin 
+;; Keywords: convenience
+;; Version: 0.1
+;; Package-Requires: ((org-ref))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; This package provides functionality to download PDFs and bibtex entries from
+;; a DOI, as well as to update a bibtex entry from a DOI.  It depends slightly
+;; on org-ref, to determine where to save pdf files too, and where to insert
+;; bibtex entries in the default bibliography.
+
+;; The principle commands you will use from here are:
+
+;; - doi-utils-get-bibtex-entry-pdf with the cursor in a bibtex entry.
+;; - doi-utils-insert-bibtex-entry-from-doi to insert a bibtex entry at your cursor, clean it and try to get a pdf.
+;; - doi-utils-add-bibtex-entry-from-doi to add an entry to your default bibliography (cleaned with pdf if possible).
+;; - doi-utils-update-bibtex-entry-from-doi with cursor in an entry to update its fields.
+
+;;; Code:
+
+(defvar org-ref-pdf-directory)
+(defvar org-ref-bibliography-notes)
+(defvar org-ref-default-bibliography)
+(defvar reftex-default-bibliography)
+(defvar url-http-end-of-headers)
+(declare-function org-ref-bib-citation "org-ref-core")
+(declare-function org-ref-find-bibliography "org-ref-core")
+(declare-function org-ref-clean-bibtex-entry "org-ref-core")
+(declare-function reftex-get-bib-field "reftex-cite")
+(declare-function bibtex-completion-edit-notes "bibtex-completion")
+(declare-function helm "helm")
+(declare-function org-bibtex-yank "org-bibtex")
+(declare-function org-ref-possible-bibfiles "org-ref-core")
+
+(eval-when-compile
+  (require 'cl-lib))
+(require 'bibtex)
+(require 'dash)
+(require 'json)
+(require 'org)                          ; org-add-link-type
+
+(or (require 'ol-bibtex nil t)
+    (require 'org-bibtex)) ; org-bibtex-yank
+
+(require 'url-http)
+(require 'org-ref-utils)
+
+;;* Customization
+(defgroup doi-utils nil
+  "Customization group for doi-utils."
+  :tag "DOI utils"
+  :group 'doi-utils)
+
+
+(defcustom doi-utils-download-pdf
+  t
+  "Try to download PDFs when adding bibtex entries when non-nil."
+  :type 'boolean
+  :group 'doi-utils)
+
+(defcustom doi-utils-open-pdf-after-download
+  nil
+  "Open PDF after adding bibtex entries."
+  :type 'boolean
+  :group 'doi-utils)
+
+(defcustom doi-utils-make-notes
+  t
+  "Whether to create notes when adding bibtex entries."
+  :type 'boolean
+  :group 'doi-utils)
+
+(defcustom doi-utils-timestamp-field
+  "DATE_ADDED"
+  "The bibtex field to store the date when an entry has been added."
+  :type 'string
+  :group 'doi-utils)
+
+(defcustom doi-utils-timestamp-format-function
+  'current-time-string
+  "The function to format the timestamp for a bibtex entry.
+Set to a function that returns nil to avoid setting timestamps in the entries.
+e.g. (lambda () nil)"
+  :type 'function
+  :group 'doi-utils)
+
+(defcustom doi-utils-make-notes-function
+  (lambda ()
+    (bibtex-beginning-of-entry)
+    (bibtex-completion-edit-notes (list (cdr (assoc "=key=" (bibtex-parse-entry))))))
+  "Function to create notes for a bibtex entry.
+
+Set `doi-utils-make-notes' to nil if you want no notes."
+  :type 'function
+  :group 'doi-utils)
+
+(defcustom doi-utils-dx-doi-org-url
+  "https://doi.org/"
+  "Base url to retrieve doi metadata from. A trailing / is required."
+  :type 'string
+  :group 'doi-utils)
+
+
+;;* Getting pdf files from a DOI
+
+;; The idea here is simple. When you visit http://dx.doi.org/doi or
+;; https://doi.org/doi, you get redirected to the journal site. Once you have
+;; the url for the article, you can usually compute the url to the pdf, or find
+;; it in the page. Then you simply download it.
+
+;; There are some subtleties in doing this that are described here. To get the
+;; redirect, we have to use url-retrieve, and a callback function. The callback
+;; does not return anything, so we communicate through global variables.
+;; url-retrieve is asynchronous, so we have to make sure to wait for it to
+;; finish.
+
+(defvar *doi-utils-waiting* t
+  "Stores waiting state for url retrieval.")
+
+(defvar *doi-utils-redirect* nil
+  "Stores redirect url from a callback function.")
+
+(defun doi-utils-redirect-callback (&optional status)
+  "Callback for `url-retrieve' to set the redirect.
+Optional argument STATUS Unknown why this is optional."
+  (when (plist-get status :error)
+    (signal (car (plist-get status :error)) (cdr(plist-get status :error))))
+  (when (plist-get status :redirect) ;  is nil if there none
+    (setq *doi-utils-redirect* (plist-get status :redirect)))
+  ;; we have done our job, so we are not waiting any more.
+  (setq *doi-utils-waiting* nil))
+
+;; To actually get the redirect we use url-retrieve like this.
+
+(defun doi-utils-get-redirect (doi)
+  "Get redirect url from `doi-utils-dx-doi-org-url'/doi."
+  ;; we are going to wait until the url-retrieve is done
+  (setq *doi-utils-waiting* t)
+  ;; start with no redirect. it will be set in the callback.
+  (setq *doi-utils-redirect* nil)
+  (url-retrieve
+   (format "%s%s" doi-utils-dx-doi-org-url doi)
+   'doi-utils-redirect-callback)
+  ;; I suspect we need to wait here for the asynchronous process to
+  ;; finish. we loop and sleep until the callback says it is done via
+  ;; `*doi-utils-waiting*'. this works as far as i can tell. Before I
+  ;; had to run this a few times to get it to work, which i suspect
+  ;; just gave the first one enough time to finish.
+  (while *doi-utils-waiting* (sleep-for 0.1)))
+
+;; Once we have a redirect for a particular doi, we need to compute the url to
+;; the pdf. We do this with a series of functions. Each function takes a single
+;; argument, the redirect url. If it knows how to compute the pdf url it does,
+;; and returns it. We store the functions in a variable:
+
+(defvar doi-utils-pdf-url-functions nil
+  "Functions that return a url to a pdf from a redirect url.
+Each function takes one argument, the redirect url.  The function
+must return a pdf-url, or nil.")
+
+
+;;** APS journals
+
+(defun aps-pdf-url (*doi-utils-redirect*)
+  "Get url to the pdf from *DOI-UTILS-REDIRECT*."
+  (when (string-match "^http://journals.aps.org" *doi-utils-redirect*)
+    (replace-regexp-in-string "/abstract/" "/pdf/" *doi-utils-redirect*)))
+
+
+;;** Science
+
+(defun science-pdf-url (*doi-utils-redirect*)
+  "Get url to the pdf from *DOI-UTILS-REDIRECT*."
+  (when (string-match "^http://www.sciencemag.org" *doi-utils-redirect*)
+    (concat *doi-utils-redirect* ".full.pdf")))
+
+
+;;** Nature
+
+(defun nature-pdf-url (*doi-utils-redirect*)
+  "Get url to the pdf from *DOI-UTILS-REDIRECT*."
+  (when (string-match "^http://www.nature.com" *doi-utils-redirect*)
+    (let ((result *doi-utils-redirect*))
+      (setq result (replace-regexp-in-string "/full/" "/pdf/" result))
+      (replace-regexp-in-string "\.html$" "\.pdf" result))))
+
+
+;;** Elsevier/ScienceDirect
+;; You cannot compute these pdf links; they are embedded in the redirected pages.
+
+(defvar *doi-utils-pdf-url* nil
+  "Stores url to pdf download from a callback function.")
+
+;;** Wiley
+;; http://onlinelibrary.wiley.com/doi/10.1002/anie.201402680/abstract
+;; http://onlinelibrary.wiley.com/doi/10.1002/anie.201402680/pdf
+
+;; It appears that it is not enough to use the pdf url above. That takes you to
+;; an html page. The actual link to teh pdf is embedded in that page. This is
+;; how ScienceDirect does things too.
+
+;; This is where the link is hidden:
+
+;; 
+
+
+(defun doi-utils-get-wiley-pdf-url (redirect-url)
+  "Wileyscience direct hides the pdf url in html.
+We get it out here by parsing the html.
+Argument REDIRECT-URL URL you are redirected to."
+  (setq *doi-utils-waiting* t)
+  (url-retrieve
+   redirect-url
+   (lambda (status)
+     (goto-char (point-min))
+     (re-search-forward "