Commit Graph

2147 Commits

Author SHA1 Message Date
Nicolas Goaziou 4f63cfabb3 Deprecate `org-babel-trim' in favor of `org-trim'
* lisp/org.el (org-trim): Add optional argument.

* contrib/lisp/ob-mathematica.el (org-babel-execute:mathematica):
* contrib/lisp/org-bibtex-extras.el (obe-html-export-citations):
* contrib/lisp/org-mime.el (org-mime-compose):
* lisp/ob-C.el (org-babel-C-execute):
* lisp/ob-calc.el (org-babel-execute:calc):
* lisp/ob-clojure.el (org-babel-expand-body:clojure):
* lisp/ob-core.el (org-babel-initiate-session):
(org-babel-parse-multiple-vars):
(org-babel-read-element):
(org-babel-insert-result):
(org-babel-expand-noweb-references):
(org-babel-trim): Mark obsolete.
* lisp/ob-forth.el (org-babel-forth-session-execute):
* lisp/ob-fortran.el (org-babel-execute:fortran):
* lisp/ob-haskell.el (org-babel-execute:haskell):
* lisp/ob-latex.el (org-babel-expand-body:latex):
* lisp/ob-lisp.el (org-babel-expand-body:lisp):
* lisp/ob-ocaml.el (org-babel-execute:ocaml):
* lisp/ob-octave.el (org-babel-octave-evaluate-session):
* lisp/ob-python.el (org-babel-python-evaluate-external-process):
(org-babel-python-evaluate-session):
* lisp/ob-ref.el (org-babel-ref-split-args):
* lisp/ob-ruby.el (org-babel-ruby-evaluate):
* lisp/ob-shell.el (org-babel-sh-evaluate):
* lisp/ob-table.el (org-sbe):
* lisp/ob-tangle.el (org-babel-spec-to-string):
* lisp/org-bibtex.el (org-bibtex-get):
* testing/lisp/test-ob.el (test-ob/parse-header-args): Use `org-trim'
  instead of `org-babel-trim'.
2016-06-21 15:33:00 +02:00
Nicolas Goaziou 0cf76b7a3f Merge branch 'maint' 2016-06-14 14:25:02 +02:00
meditans 504ffefcd5 org-mime: Fix LaTeX image bug in org-mime-org-buffer-htmlize
* contrib/lisp/org-mime.el (org-mime-replace-images): Change signature.
Always use temporary directory to create LaTeX images.
(org-mime-htmlize):
(org-mime-compose): Apply signature change above.

When exporting an org buffer with a LaTeX snippet including the Org
option "tex: dvipng" the images were always created in "/tmp/ltxpng/",
but the reported link in the htmlized buffer was the local "./ltxpng"
folder; so, unless the org file to htmlize was actually in "/tmp", the
user got an error saying that the image could not be found.

This was caused by the two different ways in which the function
`org-mime-replace-images' is used inside of
`org-mime-org-buffer-htmlize' and `org-mime-htmlize.'

To correct the problem, the function org-mime-replace-images doesn't
take anymore the current-file parameter (that was only used to get its
directory) and instead always creates a temporary directory using
temporary-file-directory.
2016-06-14 14:22:14 +02:00
Nicolas Goaziou 60c11dcb0c Merge branch 'maint' 2016-06-14 13:57:23 +02:00
Arun Isaac f364d55e2e ox-rss: Put email address in <author> element
* contrib/lisp/ox-rss.el (org-rss-headline): Put author's email
  address in <author> element.

The RSS specification requires the email address and the name of the
author to be provided in the <author> element in the format
"email@domain.com (Name)". Currently, only the author's name is
provided. This is invalid RSS.
2016-06-14 13:56:55 +02:00
Nicolas Goaziou 6ac7afba6d Merge branch 'maint' 2016-05-26 15:22:23 +02:00
Arun Isaac ddd58ff99a ox-rss: Encode characters to their XML entities
* contrib/lisp/ox-rss.el (org-rss-build-channel-info, org-rss-headline):
  Encode disallowed characters in `title' to their XML entities.

The `title' field is user specified and may contain characters such as
"&", "<" or ">" that are disallowed in XML.  These characters should be
encoded into their corresponding XML entities.
2016-05-26 15:21:01 +02:00
Nicolas Goaziou 0ac099a6f8 Remove final parts of XEmacs compatibility code
* lisp/org-compat.el: Declare `org-add-hook', `org-decompose-region',
  `org-detach-overlay', `org-file-equal-p', `org-float-time',
  `org-indent-line-to', `org-indent-to-column', `org-looking-at-p',
  `org-looking-back', `org-propertize', `org-re' and
  `org-select-frame-set-input-focus' as obsolete.
(org-overlay-display, org-overlay-before-string, org-find-overlays):
Move to "org.el"
(org-xemacs-key-equivalents, org-xemacs-p): Remove variables.
(org-region-active-p): Drop XEmacs support.
(org-xemacs-without-invisibility): Remove macro.
(org-get-x-clipboard-compat): Remove function.
* lisp/org-macs.el (org-match-string-no-properties): Remove function.

* lisp/ob-core.el:
* lisp/org-agenda.el:
* lisp/org-archive.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org-crypt.el:
* lisp/org-element.el:
* lisp/org-faces.el:
* lisp/org-feed.el:
* lisp/org-footnote.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-indent.el:
* lisp/org-inlinetask.el:
* lisp/org-lint.el:
* lisp/org-list.el:
* lisp/org-mouse.el:
* lisp/org-pcomplete.el:
* lisp/org-src.el:
* lisp/org-table.el:
* lisp/org-timer.el:
* lisp/org.el:
* lisp/ox-ascii.el:
* lisp/ox-odt.el:
* lisp/ox.el:
* contrib/lisp/org-notify.el:
* contrib/lisp/ox-taskjuggler.el:
* contrib/lisp/org-wikinodes.el:
* testing/lisp/test-org-src.el:
* testing/lisp/test-org.el: Silence byte-compiler.
2016-05-26 13:56:25 +02:00
Nicolas Goaziou a54dd63e28 Remove org-colview-xemacs.el
* contrib/lisp/org-colview-xemacs.el: Remove file.
2016-05-26 12:16:09 +02:00
Nicolas Goaziou 4129ae6737 Remove some XEmacs compatibility layer
* lisp/ob-calc.el (calc-trail):
* lisp/ob-python.el (org-babel-python-mode):
* lisp/org-agenda.el (org-agenda-tags-column):
(org-agenda-show-new-time):
* lisp/org-clock.el (org-clock-update-mode-line):
(org-clock-put-overlay):
(org-clock-resolve):
* lisp/org-faces.el (org-faces):
* lisp/org-indent.el (org-indent-mode):
* lisp/org-macs.el (org-load-noerror-mustsuffix):
* lisp/org-table.el (orgtbl-setup):
* lisp/org.el (org-key):
(org-self-insert-cluster-for-undo):
(org-tags-column):
(org-emphasis-alist):
(org-mode):
(org-set-font-lock-defaults):
(org-cycle-internal-local):
(org-tree-to-indirect-buffer):
(org-set-frame-title):
(org-priority):
(org-set-tags):
(org-set-current-tags-overlay):
(org-toggle-time-stamp-overlays):
(org-display-custom-time):
(org-diary-to-ical-string):
(org--format-latex-make-overlay):
(org-dvipng-color):
(org-latex-color):
(org-mode-map):
(org-speed-commands-default):
(org-reload):
(org-display-warning):
(org-end-of-line):
* lisp/ox-man.el (org-man-inline-src-block):
* contrib/lisp/org-vm.el (org-vm-follow-link):
* contrib/lisp/ox-groff.el (org-groff-inline-src-block):
(org-groff-src-block): Remove some XEmacs compatibility layer.
2016-05-26 11:30:11 +02:00
Brian Carlson af8e3d84ee ox: Provide offset to [+-]n in SRC/EXAMPLE export
* lisp/org-element.el (org-element-example-block-parser): Use cons cell
  for :number-lines specifying offset in addition to type (new/continue).
  ('continue . offset) for :number-lines will add this offset count to
  the last line number. ('new . offset) for :number-lines will reset the
  line number counting starting at offset
(org-element-src-block-parser): same for SRC block as EXAMPLE block

* lisp/ox-html.el (org-html-format-code):
* lisp/ox-latex.el (org-latex-src-block):
* lisp/ox-odt.el (org-odt-format-code):
* lisp/ox.el (org-export-resolve-coderef):
(org-export-get-loc):
(org-export-format-code-default):
* contrib/lisp/ox-groff.el (org-groff-src-block): Use new cons cell
  for :number-lines.

* testing/lisp/test-ox.el  (ert-deftest test-org-export/get-loc): Tests for
changes
(test-org-gen-loc-list): Helper function for `test-org-export/get-loc'.
2016-05-24 21:40:35 +02:00
Nicolas Goaziou a02fe8e8e3 orgmanual: Fix ALT_TITLE property 2016-05-19 22:25:23 +02:00
Nicolas Goaziou deea3517df orgmanual: Add GFDL 2016-05-19 22:20:18 +02:00
Nicolas Goaziou 8fb99605a0 orgmanual: Use special blocks instead of wrapper macros 2016-05-19 20:41:37 +02:00
Nicolas Goaziou ebb4ba41fd orgmanual: Move macro definitions in a dedicated section 2016-05-19 18:20:31 +02:00
Nicolas Goaziou b8a5356dbb orgmanual: Remove unnecessary code macro 2016-05-19 18:14:37 +02:00
Nicolas Goaziou bdc4b68334 orgmanual: Remove unnecessary header 2016-05-19 18:12:37 +02:00
Nicolas Goaziou f0b5f9ff89 orgmanual: Use double space convention in Texinfo 2016-05-19 18:11:46 +02:00
Nicolas Goaziou afd138f08a orgmanual: Fix badly converted index macros 2016-05-19 18:01:45 +02:00
Nicolas Goaziou 553a74004a orgmanual: Export to info without failure
Also remove the need for "org-version.inc".
2016-05-19 17:53:42 +02:00
Nicolas Goaziou 55e346c5f9 orgmanual: Pacify linter 2016-05-17 01:04:15 +02:00
Nicolas Goaziou da95b4b354 orgmanual: Use dedicated index keywords 2016-05-17 00:54:34 +02:00
Nicolas Goaziou a3efd2cb8b orgmanual: Fix comments
Use # instead of #+comment:.
2016-05-17 00:54:34 +02:00
Nicolas Goaziou 47b4a47547 contrib: Add Org manual
* contrib/orgmanual.org: New file.
2016-05-16 23:54:45 +02:00
Nicolas Goaziou 1fd6f28157 Merge branch 'maint' 2016-05-13 17:37:49 +02:00
Arun Isaac 9b5e8fdb5c ox-rss: Prevent dropping lower level headlines
* contrib/lisp/ox-rss.el (org-rss-headline): Transcode lower level
  headlines (headlines with level > 1) using the html backend.  Do not
  drop them.

Previously, lower level headlines were dropped and did not appear in the
exported RSS output.
2016-05-13 17:37:06 +02:00
Nicolas Goaziou c112f40d51 org-agenda: Remove unnecessary visibility modification
* lisp/org.el (org-show-context-detail): Change default visibility span
  for agenda context.

* lisp/org-agenda.el (org-agenda-goto):
(org-agenda-todo):
(org-agenda-add-note):
(org-agenda-priority):
(org-agenda-set-tags):
(org-agenda-set-property):
(org-agenda-set-effort):
(org-agenda-toggle-archive-tag):
(org-agenda-clock-in): Special visibility is taken care of by
`org-show-context'.  Do not hard-code anything else.

* contrib/lisp/org-contacts.el (org-contacts-gnus-article-from-goto):
Special visibility is taken care of by `org-show-context'.  Do not
hard-code anything else.
2016-04-29 11:35:49 +02:00
Rasmus 519f78d1a3 ox-koma-letter: Changes to LOCATION handling
* ox-koma-letter.el (options): Parse LOCATION and remove
  :with-location and :inbuffer-with-location.
  (org-koma-letter--get-tagged-contents): Change string handling.
  (org-koma-letter--get-value): Simplify function.
  (org-koma-letter-use-location): remove
2016-04-07 10:03:03 +02:00
Myles English a0e942544c ox-koma-letter: Fixed bug in filling 'location' field
* contrib/lisp/ox-koma-letter.el: Fix code apparently introduced
  in 3ee3663
2016-04-07 10:03:03 +02:00
Paul Schorfheide cd47ab7411 ox-confluence: Add `org-confluence-lang-alist'
* ox-confluence.el (org-confluence-src-block): Add var for mapping
language name.

TINYCHANGE
2016-04-02 10:56:05 +02:00
Myles English 3ee36639f0 ox-koma-letter: Add support for LOCATION
* contrib/lisp/ox-koma-letter.el (koma-letter): Duplicated code
  used for 'place' variable, renamed as 'location'

Whenever OPTION keyword contains a 'location' item or LOCATION
keyword is used in the buffer, set KOMA option 'location' after
LCO inclusion.
2016-03-31 21:50:11 +02:00
Rasmus 600c5c1b4b ox-koma-letter: Small change
ox-koma-letter.el (org-koma-letter--build-settings): Simplify code.
	(org-koma-letter--get-tagged-contents): Treat strings before
	return.
2016-03-31 21:49:45 +02:00
Rasmus 012346f564 ox-koma-letter: Allow buffer FROM keyword
* ox-koma-letter.el (koma-letter backend): Add :inbuffer-from.
  (org-koma-letter--get-tagged-contents): Check that value is not empty.
  (org-koma-letter-template): Remove from address block from
  template and find to address directly.
  (org-koma-letter--build-settings): Determine from address.
  (org-koma-letter--special-contents-inline): Remove function.
2016-03-31 21:43:52 +02:00
Rasmus 8eadcd3c31 ox-koma-letter: Add after_closing and cleanup
* ox-koma-letter.el
  (org-koma-letter-special-tags-after-closing): Add after_closing.
  (org-koma-letter-special-tags-as-macro): New defvar.
  (koma-letter backend): Revamp special tags options.
  (org-koma-letter--get-value): Rewrite function.
  (org-koma-letter--keyword-or-headline): Get special tags dynamically
  (org-koma-letter-template): Use new specifications.
2016-03-31 21:31:21 +02:00
Rasmus 8ba48e47d5 ox-koma-letter: Fix docstring
* ox-koma-letter.el (org-koma-letter-special-tags-as-macro): Fix docstring.
2016-03-31 21:31:21 +02:00
Nicolas Goaziou a685acc9e3 Merge branch 'maint' 2016-03-16 22:37:10 +01:00
M. P. Ashton 9879c20a34 ox-confluence: Do not generate filled paragraphs
* contrib/lisp/ox-confluence.el: (org-confluence-paragraph): New function.
(confluence): Use new function.

ox-confluence was generating filled paragraphs.  Since Confluence treats
each newline as a line break, this caused unexpected formatting.  Added
a paragraph function to generate unfilled paragraphs (taken from
ox-md.el).
2016-03-16 22:36:32 +01:00
Nicolas Goaziou e69e18dd71 Remove last `org-babel-get-header' calls
* contrib/lisp/ob-fomus.el (org-babel-expand-body:fomus):
* contrib/lisp/ob-julia.el (org-babel-variable-assignments:julia):
* contrib/lisp/ob-mathematica.el (org-babel-expand-body:mathematica):
* contrib/lisp/ob-mathomatic.el (org-babel-mathomatic-expand):
* contrib/lisp/ob-oz.el (org-babel-expand-body:oz):
* contrib/lisp/ob-stata.el (org-babel-variable-assignments:stata):
* contrib/lisp/ob-tcl.el (org-babel-variable-assignments:tcl): Use
  `org-babel--get-vars' instead of removed `org-babel-get-header'.
2016-03-10 13:57:06 +01:00
Kyle Meyer 268486a790 org-link-edit.el: Sync with upstream
v1.0.1 (37a5ade92)
2016-03-08 01:51:31 -05:00
Simon Thum aa78158036 org-contacts: Register "tel" link
This has the added benefit of not screwing up the exporter.

Signed-off-by: Simon Thum <simon.thum@gmx.de>
2016-02-25 10:14:25 +01:00
Arun Isaac e278cffa3b ox-rss: Implement RSS_FEED_URL option keyword
* contrib/lisp/ox-rss.el (org-rss-build-channel-info): Try to use the
  specified RSS_FEED_URL option keyword as publink before resorting to
  concatenating blogurl with output filename.

The RSS_FEED_URL goes into the atom:link element that identifies the
feed's own URL. Currently, the feed URL is assumed to be html-link-home
or publishing-directory concatenated with the output filename of the
feed. This need not always be so. So, the RSS_FEED_URL option keyword
is introduced to let the user customize the feed URL.
2016-02-25 10:09:55 +01:00
Nicolas Goaziou 9738da4732 ob: Rewrite `org-babel-get-src-block-info' using parser
* lisp/ob-core.el (org-babel-get-src-block-info): Rewrite function.
  Change signature.
(org-babel-parse-src-block-match):
(org-babel-parse-inline-src-block-match): Remove functions.
(org-babel-execute-src-block): Remove useless function call.

* lisp/ob-exp.el (org-babel-exp-process-buffer): Make use of signature
  change.
(org-babel-exp-results): Use new return value from
`org-babel-get-src-block-info'.  Tiny refactoring.

* testing/lisp/test-ob.el (test-ob/nested-code-block): Fix test.
* contrib/lisp/org-eldoc.el (org-eldoc-get-src-lang): Use parser instead
  of removed function.

* testing/examples/babel.org: Fix test environment.
2016-02-10 23:50:45 +01:00
Nicolas Goaziou 13427c9029 Improve compilation checks for some back-ends
* contrib/lisp/ox-groff.el (org-groff-compile):
* lisp/ox-man.el (org-man-compile):
* lisp/ox-texinfo.el (org-texinfo-compile): Check more carefully if
  output file was produced.
2016-01-28 10:02:04 +01:00
David Arroyo Menéndez 26fb4fa54e org-effectiveness.el: Add org-effectiveness-plot-ascii-dones, fix org-effectiveness-advice and fix org-effectiveness-dones-in-date. 2016-01-25 15:24:25 +01:00
David Arroyo Menéndez 0c3ea42a7c org-effectiveness.el: Add save-excursion to org-effectiveness-dones-in-date, org-effectiveness-canceled-in-date, org-effectiveness-todos-in-date
* contrib/lisp/org-effectiveness.el (org-effectiveness-dones-in-date, org-effectiveness-canceled-in-date, org-effectiveness-todos-in-date): Add save-excursion
2016-01-25 12:07:16 +01:00
David Arroyo Menéndez 5d78665c8c org-effectiveness.el: Add org-effectiveness-ntasks-in-date and org-effectiveness-plot-ascii-ntasks
* contrib/lisp/org-effectiveness.el (org-effectiveness-ntasks-in-date, org-effectiveness-plot-ascii-ntasks): Add functions.
2016-01-18 10:21:02 +01:00
David Arroyo Menéndez a20abaa725 org-effectiveness.el: Add org-effectiveness-count-task
* contrib/lisp/org-effectiveness.el (org-effectiveness-count-task): Add function.
2016-01-18 09:45:21 +01:00
Kyle Meyer 4de71e483a Merge branch 'maint' 2016-01-12 02:18:34 -05:00
Kyle Meyer ba5e1be148 ox-bibtex: Fix bibliography location in HTML
* contrib/lisp/ox-bibtex.el (org-bibtex-process-bib-files): Fix
  insertion location of bibliography in HTML export.

Reported-by: gongzhitaao <zhitaao.gong@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104117>
2016-01-11 23:32:29 -05:00
Nicolas Goaziou a02a83793b Make `org-make-tags-matcher' lexical binding friendly
* lisp/org.el (org-make-tags-matcher): Return a function instead of
  a sexp.  Refactor code.
(org--matcher-tags-todo-only): New variable.  Replace `todo-only'
dynamic binding.
(org-scan-tags): Apply changes to `org-make-tags-matcher'.
(org-match-sparse-tree):
(org-map-entries): Use new variable.

* lisp/org-crypt.el (org-encrypt-entries):
(org-decrypt-entries): Use new variable.

* lisp/org-clock.el (org-clock-get-table-data): Apply changes to
  `org-make-tags-matcher'.

* lisp/org-agenda.el (org-tags-view): Use new variable.
2016-01-10 21:16:29 +01:00