2 years agoAdd faces for "calendar events" (active timestamps, or S-expressions).
Sebastien Vauban [Fri, 18 Nov 2011 12:41:47 +0000]
Add faces for "calendar events" (active timestamps, or S-expressions).

* org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-sexps): Use face for highlighting "calendar"

* org-faces.el: Add faces `org-agenda-calendar-event' and

2 years agoTimestamps: Fix org-schedule and org-deadline with absolute time arguments
Peter Münster [Mon, 21 Nov 2011 21:21:41 +0000]
Timestamps: Fix org-schedule and org-deadline with absolute time arguments

* lisp/org.el (org-add-planning-info): Treat absolute time too.


2 years ago* org-table.el (org-table-transpose-table-at-point): Don't use ̀remove-if-not'.
Bastien Guerry [Sun, 11 Dec 2011 17:38:45 +0000]
* org-table.el (org-table-transpose-table-at-point): Don't use ̀remove-if-not'.

* org-table.el (org-table-transpose-table-at-point): Don't use

Thanks to Achim Gratz for spotting this.

2 years ago org-clock.el: Check the clock buffer is existing when clocking out.
Dave Abrahams [Sun, 11 Dec 2011 17:25:58 +0000]
 org-clock.el: Check the clock buffer is existing when clocking out.

* org-clock.el (org-clock-out-if-current): Check the clock
buffer is existing.


2 years agoFix marker in no buffer error for task state change in an indirect buffer
Bernt Hansen [Sun, 20 Nov 2011 02:44:07 +0000]
Fix marker in no buffer error for task state change in an indirect buffer

* lisp/org-clock.el (org-clock-out-if-current): Fix marker in no buffer error
  for task state change in an indirect buffer

org-clock-out-when-current was enhanced in 098cf35 (Clock: Clock out
when done also in indirect buffers, 2009-03-23) to handle indirect

This enhancement uses (buffer-base-buffer (org-clocking-buffer)) but
when not clocking (org-clocking-buffer) returns nil - so
buffer-base-buffer returns the base buffer of the current buffer which
is never nil.  This leads to marker in no buffer errors trying to stop
the clock when it is not running.

Now we explicitly check up front that the clock is running before
any other conditions that lead to stopping the clock.

2 years agoBugfix open 1 link from list; doc more link types
Michael Brand [Sat, 26 Nov 2011 09:39:54 +0000]
Bugfix open 1 link from list; doc more link types

* doc/org.texi (External links): Document the link types file+sys and
file+emacs, slightly narrow used page width.
* lisp/org.el (org-offer-links-in-entry): Make list when assigning a
single link.

"M-1 C-c C-o" or (org-open-at-point 1) or (org-offer-links-in-entry 1)
on a headline followed by two links enters Lisp error.  Both changes
are remainders of the commit release_6.33f-189-g3e0c61d.

2 years agoremove #+name and #+result hiding
Eric Schulte [Mon, 28 Nov 2011 07:43:35 +0000]
remove #+name and #+result hiding

Given that arbitrary regions may already be hidden using a drawer the
ability to hide any named entity is redundant.  In addition the name
based hiding does not mix well with other keywords.

Thanks to Nicolas Goaziou for raising this issue and suggesting the
removal of #+name based hiding.

2 years agofaster method of collecting continuing code blocks
Eric Schulte [Sun, 11 Dec 2011 16:28:58 +0000]
faster method of collecting continuing code blocks

* lisp/ob.el (org-babel-expand-noweb-references): Rather than collect
  the info from *every* block in the current buffer, simply regexp
  search for those blocks which appear to match the continued source

2 years agowrap code block results in drawers rather than blocks
Eric Schulte [Sun, 11 Dec 2011 16:27:48 +0000]
wrap code block results in drawers rather than blocks

* lisp/ob.el (org-babel-insert-result): Do not examplize wrapped
  scalar results, simply wrap them.
  (org-babel-result-end): Find the end of results wrapped in a RESULTS

2 years agoMake `org-todo-yesterday' call `org-agenda-todo-yesterday' if necessary.
Bastien Guerry [Sun, 11 Dec 2011 16:52:10 +0000]
Make `org-todo-yesterday' call `org-agenda-todo-yesterday' if necessary.

* org.el (org-todo-yesterday): When called from the agenda,
use `org-agenda-todo-yesterday' instead.

2 years agoNew command: `org-table-transpose-table-at-point'.
Bastien Guerry [Sun, 11 Dec 2011 16:34:37 +0000]
New command: `org-table-transpose-table-at-point'.

* org-table.el (org-table-transpose-table-at-point): New

Thanks to Juan Pechiar for this function.

2 years agoRewrite of contrib/lisp/org-velocity.el.
Paul M. Rodriguez [Sun, 11 Dec 2011 16:14:09 +0000]
Rewrite of contrib/lisp/org-velocity.el.

From the author: "This is a rewrite of Org-Velocity for speed. Delays due
to file size should no longer be perceptible. I have also added in-line
previews of entry contents and dropped support for Org-Remember."

2 years agoNew option `org-export-html-headline-anchor-format'.
Bastien Guerry [Sun, 11 Dec 2011 15:50:05 +0000]
New option `org-export-html-headline-anchor-format'.

* org-html.el (org-export-html-headline-anchor-format): New
(org-html-level-start): Use the new option.

This was requested by Alan L Tyree.

2 years agoAdd a commentary: how to test org-e-latex.el.
Bastien Guerry [Sun, 11 Dec 2011 15:33:34 +0000]
Add a commentary: how to test org-e-latex.el.

2 years agoRename EXPERIMENTAL/org-latex.el to EXPERIMENTAL/org-e-latex.el.
Bastien Guerry [Sun, 11 Dec 2011 15:23:09 +0000]
Rename EXPERIMENTAL/org-latex.el to EXPERIMENTAL/org-e-latex.el.

This prevents a namespace conflict with lisp/org-latex.el.  By
convention, new exporters in EXPERIMENTAL/ will share the org-e-*

2 years agoFix quoting in org-agenda-with-point-at-orig-entry.
Rob Giardina [Sun, 11 Dec 2011 13:47:25 +0000]
Fix quoting in org-agenda-with-point-at-orig-entry.

* org-agenda.el (org-agenda-with-point-at-orig-entry): Small


2 years agoMinor example fix.
Bastien Guerry [Sun, 11 Dec 2011 13:25:16 +0000]
Minor example fix.

Thanks to Dov Grobgeld for spotting this.

2 years agoSpecial blocks: Make well-formed HTML
Christian Moe [Sun, 11 Dec 2011 13:11:05 +0000]
Special blocks: Make well-formed HTML

* org-special-blocks.el
(org-special-blocks-convert-html-special-cookies): Close paragraph
before opening or closing the <div>, and open paragraph after. Also
changed newline placement to be the same as for other blocks.

The problem was that special blocks did not produce well-formed HTML
because they  wrapped the opening and closing
<div> tags in <p> tags.


This patch only borrows a few lines from the handling of `CENTER'
blocks in org-export-as-html.

2 years agoNew option `org-table-formula-field-format'.
Bastien Guerry [Sun, 11 Dec 2011 13:05:13 +0000]
New option `org-table-formula-field-format'.

Format for fields which contain the result of a formula.
For example, using \"~%s~\" will display the result within tilde
characters.  Beware that modifying the display can prevent the
field from being used in another formula.

Based on an idea of Dov Grobgeld.

2 years agoMerge branch 'master' of
Bastien Guerry [Sun, 11 Dec 2011 12:53:23 +0000]
Merge branch 'master' of

2 years agoMake the function `org-program-exists' work on osx.
Roberto Huelga [Sun, 11 Dec 2011 12:50:36 +0000]
Make the function `org-program-exists' work on osx.

* org-clock.el (org-program-exists): Make the function
compatible with darwin systems.

2 years agoCode indentation fix (tabify)
Nicolas Goaziou [Fri, 9 Dec 2011 13:38:36 +0000]
Code indentation fix (tabify)

2 years agoAvoid erroneous normalization of bracket link parts
David Maus [Sun, 11 Dec 2011 09:53:14 +0000]
Avoid erroneous normalization of bracket link parts

* org-exp.el (org-export-normalize-links): Mark bracket links before
normalization to avoid erroneous normalization of bracket link parts.

This fixes a bug reported by M. Bauer at
<> and allows proper
normalization of bracket links with a link in the query part, e.g.


2 years agoorg.texi (Custom Table Styles - An Illustration): New node
Jambunathan K [Sun, 11 Dec 2011 08:38:28 +0000]
org.texi (Custom Table Styles - An Illustration): New node

Also improve various menus.

2 years agoorg.texi (Validating OpenDocument XML): New node
Jambunathan K [Sat, 10 Dec 2011 23:04:29 +0000]
org.texi (Validating OpenDocument XML): New node

2 years agoorg-odt.el (org-export-odt-schema-dir): Modified
Jambunathan K [Sat, 10 Dec 2011 19:18:20 +0000]
org-odt.el (org-export-odt-schema-dir): Modified

2 years agoMakefile (PKG_FILES) : Include etc/
Jambunathan K [Sat, 10 Dec 2011 15:09:07 +0000]
Makefile (PKG_FILES) : Include etc/

Also fix all byte-compiler warnings in org-lparse.el and org-odt.el.

2 years agoAdd string input variables to ob-octave.el. Add tests for ob-octave.el
Litvinov Sergey [Tue, 8 Nov 2011 21:19:04 +0000]
Add string input variables to ob-octave.el. Add tests for ob-octave.el

2 years agoorg.texi: Improve ODT section
Jambunathan K [Tue, 6 Dec 2011 22:34:55 +0000]
org.texi: Improve ODT section

2 years agoorg.texi: Improve ODT section
Jambunathan K [Tue, 6 Dec 2011 21:12:52 +0000]
org.texi: Improve ODT section

2 years agoorg.texi: Improve ODT section
Jambunathan K [Tue, 6 Dec 2011 19:35:14 +0000]
org.texi: Improve ODT section

2 years agoorg.texi: Refine ODT section
Jambunathan K [Tue, 6 Dec 2011 18:38:54 +0000]
org.texi: Refine ODT section

2 years agodoc/org.texi: Update ODT section
Jambunathan K [Sun, 4 Dec 2011 19:20:12 +0000]
doc/org.texi: Update ODT section

2 years agoAdd copyright and license info for files in etc/styles/
Jambunathan K [Mon, 5 Dec 2011 07:15:35 +0000]
Add copyright and license info for files in etc/styles/

2 years agoorg-odt.el: Misc changes to reflect change in dir layout
Jambunathan K [Sun, 4 Dec 2011 22:01:02 +0000]
org-odt.el: Misc changes to reflect change in dir layout

* lisp/org-odt.el (org-odt-data-dir): Removed.
(org-odt-styles-dir, org-export-odt-schema-dir): New

2 years agoMakefile (LISPF): Add org-lparse.el and org-odt.el
Jambunathan K [Sun, 4 Dec 2011 21:00:57 +0000]
Makefile (LISPF): Add org-lparse.el and org-odt.el

Also update dependencies.

2 years agoorg-exp.el: s/OpenDocumentText/OpenDocument Text/
Jambunathan K [Sun, 4 Dec 2011 20:58:13 +0000]
org-exp.el: s/OpenDocumentText/OpenDocument Text/

2 years agoorg.el (org-modules): odt is no longer a contrib module
Jambunathan K [Sun, 4 Dec 2011 20:57:26 +0000]
org.el (org-modules): odt is no longer a contrib module

2 years agoMove org-lparse.el and org-odt.el to the main lisp dir
Jambunathan K [Sun, 4 Dec 2011 20:46:03 +0000]
Move org-lparse.el and org-odt.el to the main lisp dir

2 years agoMove contrib/odt/styles/*.xml to etc/styles
Jambunathan K [Sun, 4 Dec 2011 20:27:50 +0000]
Move contrib/odt/styles/*.xml to etc/styles

2 years agoDelete org-export.el, org-mw.el and org-mm.el.
Bastien Guerry [Sat, 10 Dec 2011 16:58:20 +0000]
Delete org-export.el, org-mw.el and org-mm.el.

org-export.el conflicts with contrib/lisp/org-export.el and the
two org-mw.el org-mm.el don't work without it.  A rewrite of these
experimental exporters using Nicolas' org-export.el is necessary.

2 years agoRevert "Rename EXPERIMENTAL/org-latex.el to EXPERIMENTAL/org-latex-old.el"
Bastien Guerry [Sat, 10 Dec 2011 16:38:36 +0000]
Revert "Rename EXPERIMENTAL/org-latex.el to EXPERIMENTAL/org-latex-old.el"

This reverts commit a75e29ca5bc14734c760823c28540730f7a6eff8.

2 years agoUTILITIES/man*: Fix bug: don't insert </style>
Bastien Guerry [Sat, 10 Dec 2011 12:46:50 +0000]
UTILITIES/man*: Fix bug: don't insert </style>

2 years agoRename EXPERIMENTAL/org-latex.el to EXPERIMENTAL/org-latex-old.el
Bastien Guerry [Sat, 10 Dec 2011 11:49:54 +0000]
Rename EXPERIMENTAL/org-latex.el to EXPERIMENTAL/org-latex-old.el

This is necessary to prepare release 7.8.

2 years agoMerge branch 'master' of
Carsten Dominik [Fri, 9 Dec 2011 22:23:07 +0000]
Merge branch 'master' of

2 years agoAdd the binding for org-table-wrap-region to orgtbl-mode
Carsten Dominik [Fri, 9 Dec 2011 22:22:56 +0000]
Add the binding for org-table-wrap-region to orgtbl-mode

2 years agoEXPERIMENTAL/org-latex: Fix bug in table transcoding
Nicolas Goaziou [Wed, 7 Dec 2011 20:03:05 +0000]
EXPERIMENTAL/org-latex: Fix bug in table transcoding

* EXPERIMENTAL/org-latex.el (org-latex-table): Fix confusion between
  communication channel and table information plists.

2 years agocontrib/lisp/org-export: Extract more properties from tables
Nicolas Goaziou [Wed, 7 Dec 2011 16:39:51 +0000]
contrib/lisp/org-export: Extract more properties from tables

* contrib/lisp/org-export.el (org-export-table-format-info): Extract
column width and and row groups.

2 years agoFix typos (already fixed in Emacs trunk.)
Bastien Guerry [Tue, 6 Dec 2011 18:20:21 +0000]
Fix typos (already fixed in Emacs trunk.)

Thanks to Juanma Barranquero for spotting and fixing them in Emacs.

2 years agoFix bug in org-capture file+datetree+promt target type
Carsten Dominik [Tue, 6 Dec 2011 08:00:27 +0000]
Fix bug in org-capture file+datetree+promt target type

* lisp/org-capture.el (org-capture-set-target-location): Set the capture
default time also to the prompt time.

In the file+datetree+promt target type, the user is being asked for a
date, where to file an entry.  In the template, there can the escape
placeholders for active and inactive time stamps.  So far, these were
filled with todays date.  This patch changes this behavior, so that
also at %t and %u escaped, the date entered at the prompt will be

Reported by Erik Hetzner.

2 years agoorg-export: Cleanup #+name and #+results
Nicolas Goaziou [Sun, 4 Dec 2011 16:00:46 +0000]
org-export: Cleanup #+name and #+results

* lisp/org-exp.el (org-export-res/src-name-cleanup): Remove #+name and
  #+results lines during preprocess.

Now Babel doesn't handle anymore those keywords cleanup (as #+name may
be used for other thing than code evaluation), that task is moved to
org-export.el.  See commit 25a0a0212193ecc5e910696301b3a64a51f837e0.

2 years agoorg.texi: Fix typos.
Bastien Guerry [Sun, 4 Dec 2011 10:44:23 +0000]
org.texi: Fix typos.

Thanks to Paul Eggert for spotting this and fixing it in Emacs.

2 years agocontrib/lisp/org-element: Re-order a function within the file
Nicolas Goaziou [Thu, 1 Dec 2011 14:42:06 +0000]
contrib/lisp/org-element: Re-order a function within the file

2 years agocontrib/lisp/org-element: Do not map function to ignored elements or objects
Nicolas Goaziou [Thu, 1 Dec 2011 13:57:59 +0000]
contrib/lisp/org-element: Do not map function to ignored elements or objects

* contrib/lisp/org-element.el (org-element-map): In an export
  situation, only map function on included elements or objects.

2 years agocontrib/lisp/org-export: Fix headline numbering
Nicolas Goaziou [Thu, 1 Dec 2011 13:01:32 +0000]
contrib/lisp/org-export: Fix headline numbering

* contrib/lisp/org-export.el (org-export-persistent-properties-list):
  Remove unused persistent properties.
(org-export-initialize-persistent-properties): Delegate headline
  numbering alist to `org-export-collect-headline-numbering'.
(org-export-collect-headline-numbering): New function.
(org-export-update-info): Remove part relative to headline numbering.
(org-export-get-headline-number): Use new `:headline-numbering' to get
  current headline number.

Headline numbering is not done on demand anymore, but built once and
for all at the beginning of the export process, and stored in an
alist, accessible through the `:headline-numbering' property in the
communication channel.

2 years agoEXPERIMENTAL/org-latex: Small refactoring.
Nicolas Goaziou [Tue, 29 Nov 2011 20:37:15 +0000]
EXPERIMENTAL/org-latex: Small refactoring.

* EXPERIMENTAL/org-latex.el (org-latex-footnote-reference): Small

2 years agofix compiler warnings in ob-picolisp
Eric Schulte [Tue, 29 Nov 2011 16:16:14 +0000]
fix compiler warnings in ob-picolisp

* lisp/ob-picolisp.el (ob-comint): Required.
  (comint): Required.
  (cl): Required.
  (run-picolisp): Declared.
  (org-babel-execute:picolisp): Capture free variable, and replace
  function from cl-extra with core function.

2 years agomoving ob-picolisp into the core
Eric Schulte [Tue, 29 Nov 2011 16:05:31 +0000]
moving ob-picolisp into the core

Thanks to Thorsten Jolitz for contributing support for this new

* Makefile (LISPF): Add ob-picolisp to the Makefile.
* contrib/babel/langs/ob-picolisp.el: Remove from contrib.
* lisp/ob-picolisp.el: Add to core lisp directory.
* lisp/org.el (org-babel-load-languages): Add Pico Lisp to the list of
  supported code block languages.

2 years agoimproved warnings of bibtex errors during multi-headline export
Eric Schulte [Tue, 29 Nov 2011 15:56:27 +0000]
improved warnings of bibtex errors during multi-headline export

* lisp/org-bibtex.el (org-bibtex): Now catches bibtex errors and
  directs the user to the location of the error.

2 years agoEXPERIMENTAL/org-latex: LaTeX back-end for generic exporter
Nicolas Goaziou [Mon, 28 Nov 2011 22:36:51 +0000]
EXPERIMENTAL/org-latex: LaTeX back-end for generic exporter

* EXPERIMENTAL/org-latex.el (org-latex-option-alist,
  org-latex-default-class, org-latex-classes
  org-latex-inputenc-alist, org-latex-date-format,
  org-latex-title-command, org-latex-format-headline-function, org-latex-emphasis-alist,
  org-latex-footnote-separator, org-latex-active-timestamp-format,
  org-latex-diary-timestamp-format, org-latex-image-default-option,
  org-latex-default-figure-position, org-latex-inline-image-extensions,
  org-latex-default-table-environment, org-latex-tables-centered,
  org-latex-tables-verbatim, org-latex-table-caption-above,
  org-latex-format-inlinetask-function, org-latex-listings, org-latex-listings-langs,
  org-latex-listings-options, org-latex-minted-langs,
  org-latex-minted-options, org-latex-quotes,
  org-latex-custom-lang-environments): New variables.
(org-latex--caption/label-string, org-latex--guess-inputenc,
  org-latex--find-verb-separator, org-latex--make-option-string,
  org-latex--quotation-marks, org-latex--wrap-label,
  org-latex-template, org-latex-center-block, org-latex-drawer,
  org-latex-dynamic-block, org-latex-emphasis, org-latex-entity,
  org-latex-example-block, org-latex-export-snippet,
  org-latex-export-block, org-latex-fixed-width,
  org-latex-footnote-reference, org-latex-headline,
  org-latex-horizontal-rule, org-latex-inline-src-block,
  org-latex-inlinetask, org-latex-item, org-latex-keyword,
  org-latex-latex-environment, org-latex-latex-fragment,
  org-latex-line-break, org-latex-link--inline-image, org-latex-link,
  org-latex-macro, org-latex-paragraph, org-latex-plain-list,
  org-latex-plain-text, org-latex-property-drawer,
  org-latex-quote-block, org-latex-quote-section,
  org-latex-radio-target, org-latex-special-block,
  org-latex-src-block, org-latex-statistics-cookie,
  org-latex-subscript, org-latex-superscript,
  org-latex-table--format-string, org-latex-table--align-string,
  org-latex-table, org-latex-target, org-latex-time-stamp,
  org-latex-verbatim, org-latex-verse-block): New functions.

2 years agocontrib/lisp/org-export: Fix visibility influence on list parsing
Nicolas Goaziou [Mon, 28 Nov 2011 19:14:20 +0000]
contrib/lisp/org-export: Fix visibility influence on list parsing

* contrib/lisp/org-export.el (org-export-with-current-buffer-copy):
  Full invisibility prevents `current-column' from returning useful
  values.  Thus, keep visibility related text-properties and set
  `buffer-invisibility-spec' to nil.

2 years agonote that colnames behavior may differ across languages
Eric Schulte [Mon, 28 Nov 2011 18:21:52 +0000]
note that colnames behavior may differ across languages

* doc/org.texi (colnames): Note that colnames behavior may differ
  across languages.

2 years agotests for the colnames header argument
Eric Schulte [Mon, 28 Nov 2011 08:55:28 +0000]
tests for the colnames header argument

2 years agoorg-agenda.el (org-agenda-dim-blocked-tasks): Fix typo.
Bastien Guerry [Mon, 28 Nov 2011 14:23:27 +0000]
org-agenda.el (org-agenda-dim-blocked-tasks): Fix typo.

* org-agenda.el (org-agenda-dim-blocked-tasks): Fix typo.

Thanks to Paul Eggert for spotting this and fixing it in Emacs trunk.

2 years agoorg.texi (Weekly/daily agenda, Agenda commands): Fix typos.
Bastien Guerry [Mon, 28 Nov 2011 14:17:15 +0000]
org.texi (Weekly/daily agenda, Agenda commands): Fix typos.

* org.texi (Weekly/daily agenda, Agenda commands): Fix typos.

Thanks to Paul Eggert for spotting this.

2 years agoFix typo fixed in Emacs trunk.
Bastien Guerry [Mon, 28 Nov 2011 14:13:04 +0000]
Fix typo fixed in Emacs trunk.

* ob.el (org-babel-execute-src-block): Fix typo.

Thanks to Juanma Barranquero for spotting this.

2 years agoFix typos fixed in Emacs trunk.
Bastien Guerry [Mon, 28 Nov 2011 14:11:52 +0000]
Fix typos fixed in Emacs trunk.

* org-freemind.el (org-freemind-write-mm-buffer): Fix typo.

* org-colview.el (org-columns-edit-value) (org-columns-next-allowed-value):
  Fix typos.

* org-bibtex.el (org-bibtex-autogen-keys): Fix typo.

* org-clock.el (org-clock-special-range): Fix typo.

Thanks to Paul Eggert for these fixes.

2 years agoorg.el: Fix two typos in docstrings.
Bastien Guerry [Mon, 28 Nov 2011 14:07:49 +0000]
org.el: Fix two typos in docstrings.

* org.el (org-link-unescape, org-link-unescape-compound): Fix two
  typos in docstrings.

2 years ago* lisp/ob-R.el: Added tikzDevice support.
Thomas Dye [Sun, 27 Nov 2011 07:17:00 +0000]
* lisp/ob-R.el: Added tikzDevice support.

2 years agocontrib/lisp/org-export: Fix a docstring.
Nicolas Goaziou [Fri, 25 Nov 2011 18:33:23 +0000]
contrib/lisp/org-export: Fix a docstring.

* contrib/lisp/org-export.el (org-export-option-alist): Fix docstring.

2 years agocontrib/lisp/org-export.el: Fix misleading comments about transcoders
Nicolas Goaziou [Fri, 25 Nov 2011 18:06:19 +0000]
contrib/lisp/org-export.el: Fix misleading comments about transcoders

* contrib/lisp/org-export.el: Fix misleading comments about transcoders.

2 years agoorg-babel-exp-lob-one-liners should not parse the entire buffer.
Jérémy Compostella [Thu, 24 Nov 2011 15:20:00 +0000]
org-babel-exp-lob-one-liners should not parse the entire buffer.

The org-babel-exp-lob-one-liners search "call" pattern through the entire
buffer instead of the region given as arguments.

2 years agocontrib/org-export: Generic Export Engine For Org
Nicolas Goaziou [Fri, 25 Nov 2011 15:02:27 +0000]
contrib/org-export: Generic Export Engine For Org

* contrib/lisp/org-export.el (org-export-collect-options,
  org-export-parse-option-keyword, org-export-get-subtree-options,
  org-export-get-inbuffer-options, org-export-get-global-options,
  org-export-initial-options, org-export-confirm-letbind,
  org-export-use-select-tags-p, org-export-get-min-level,
  org-export-get-point-max, org-export-update-info,
  org-export-set-property, org-export-data,
  org-export-secondary-string, org-export-skip-p,
  org-export-interpret-p, org-export-filter-apply-functions,
  org-export-as, org-export-to-buffer, org-export-get-relative-level,
  org-export-get-headline-number, org-export-number-to-roman,
  org-export-first-sibling-p, org-export-last-sibling-p,
  org-export-included-file, org-export-get-file-contents,
  org-export-parse-included-file, org-export-solidify-link-text,
  org-export-get-coderef-format, org-export-inline-image-p,
  org-export-resolve-fuzzy-link, org-export-expand-macro,
  org-export-handle-code, org-export-table-format-info,
  org-export-clean-table, org-export-get-headlines,
  org-export-collect-elements, org-export-collect-tables,
  org-export-get-figures, org-export-collect-listings): New functions.
(org-export-max-depth, org-export-option-alist,
  org-export-special-keywords, org-export-persistent-properties-list,
  org-export-persistent-properties, org-export-with-archived-trees,
  org-export-with-author, org-export-with-creator,
  org-export-creator-string, org-export-with-drawers,
  org-export-with-email, org-export-with-emphasize,
  org-export-exclude-tags, org-export-with-fixed-width,
  org-export-with-footnotes, org-export-headline-levels,
  org-export-default-language, org-export-preserve-breaks,
  org-export-with-entities, org-export-with-priority,
  org-export-with-section-numbers, org-export-select-tags,
  org-export-with-special-strings, org-export-with-sub-superscripts,
  org-export-with-toc, org-export-with-tables, org-export-with-tags,
  org-export-with-tasks, org-export-time-stamp-file,
  org-export-with-timestamps, org-export-with-todo-keywords,
  org-export-allow-BIND, org-export-snippet-translation-alist,
  org-export-filter-verbatim-functions): New variables.

2 years agoorg-odt.el: Export TOC max-level information.
Jeremy Compostella [Sat, 19 Nov 2011 12:43:39 +0000]
org-odt.el: Export TOC max-level information.

The TOC max level which could be specified by user is lost during the
export operation. However, this information could be useful in particular
with the ODT exporter. So if another script work on the ODT afterward and
ask to re-compute the TOC, the new TOC will keep this max level.


2 years agoorg-odt.el: Fix performance issue on manifest file writing
Jambunathan K [Thu, 24 Nov 2011 18:16:34 +0000]
org-odt.el: Fix performance issue on manifest file writing

* contrib/lisp/org-odt.el (org-odt-write-manifest-file): Don't
use write-region.

The org-odt-write-manifest-file function take too much time -
several seconds for 164 files. This patch provides a cheaper
implementation (hundredths of a seconds for 164 files).

Original patch by Jérémy Compostella
<>.  Rewritten by Jambunathan K to
minimize the actual number of lines changed.


I'm currently generating a road book for a trip from different
Org-Mode file and other data. It results in a 13 thousands
lines Org-Mode file and I have some performance issues. Using
the ELP package, I isolated the two main bottlenecks.

One is in org-odt : the org-odt-write-manifest-file function
is called once and takes 5.546672 seconds to write a 167 lines
file. I rewrote this function and now it takes 0.01606 seconds
to write the same file.

2 years agoorg-element: Fix parsing of src-block switches when there is more than one
Nicolas Goaziou [Thu, 24 Nov 2011 13:29:53 +0000]
org-element: Fix parsing of src-block switches when there is more than one

* contrib/lisp/org-element.el (org-element-src-block-parser): Previous
  regexp would only get the last switch if more than one were

2 years agoMerge branch 'master' of
David Maus [Wed, 23 Nov 2011 20:35:47 +0000]
Merge branch 'master' of

2 years agoRemove clocking information when preparing a clone
David Maus [Wed, 23 Nov 2011 20:35:35 +0000]
Remove clocking information when preparing a clone

* org.el (org-clone-subtree-with-time-shift): Remove clocking
information and empty drawers when preparing a clone.

Fixes a regression introduced by
516b2fbb8763788585ac6a9f60ad7d51c4b0aab3, reported by Bernt Hansen in

2 years ago* doc/org.texi: Augmented discussion of babel property inheritance. Put footnote...
Thomas Dye [Wed, 23 Nov 2011 18:34:31 +0000]
* doc/org.texi: Augmented discussion of babel property inheritance. Put footnote outside sentence ending period.

2 years agoMerge branch 'master' of
Carsten Dominik [Wed, 23 Nov 2011 06:36:23 +0000]
Merge branch 'master' of

2 years agoRequire parse-time for `org-read-date-get-relative'
Carsten Dominik [Wed, 23 Nov 2011 06:36:07 +0000]
Require parse-time for `org-read-date-get-relative'

2 years agoorg-odt.el: Fix a bug wrt label references
Jambunathan K [Wed, 23 Nov 2011 00:31:33 +0000]
org-odt.el: Fix a bug wrt label references

* contrib/lisp/org-odt.el (org-odt-fixup-label-references)
(org-export-odt-preprocess-label-references): Modified.

Workaround for issue reported here:

2 years agono longer strip code and result names during block preprocessing
Eric Schulte [Tue, 22 Nov 2011 15:18:26 +0000]
no longer strip code and result names during block preprocessing

* lisp/ob-exp.el: Don't add `org-exp-res/src-name-cleanup' to

2 years agocorrectly toggle visibility of named code blocks
Eric Schulte [Tue, 22 Nov 2011 15:05:34 +0000]
correctly toggle visibility of named code blocks

* lisp/ob.el (org-babel-hide-result-toggle): Skip over header argument
  lines when toggling named code block visibility.

2 years agoDon't license to kill text inside blocks when getting a title
Eric Schulte [Tue, 22 Nov 2011 14:56:00 +0000]
Don't license to kill text inside blocks when getting a title

* lisp/org-exp.el (org-export-grab-title-from-buffer): Don't license
  to kill text inside blocks when getting a title.

2 years agothe :eval header argument now takes 4(6) possible values
Eric Schulte [Tue, 22 Nov 2011 14:32:39 +0000]
the :eval header argument now takes 4(6) possible values

* doc/org.texi (eval): Documenting the full range of :eval header
  argument values.
* lisp/ob.el (org-babel-confirm-evaluate): Adding support for new
  range of :eval header arguments.
* testing/lisp/test-ob.el (test-ob/eval-header-argument): Testing the
  :eval header argument.

2 years agoRevert "Revert "new babel latex feature :imagemagick -- By Andreas Leha""
Eric Schulte [Tue, 22 Nov 2011 13:59:58 +0000]
Revert "Revert "new babel latex feature :imagemagick -- By Andreas Leha""

This reverts commit c6f6b3421ee9050a980f8fa0b5615e3f7136e7a8.

Andreas has now signed the FSF copyright assignment papers.

2 years ago":eval non-export" inhibits evaluation during export
Eric Schulte [Tue, 22 Nov 2011 01:19:45 +0000]
":eval non-export" inhibits evaluation during export

* doc/org.texi (eval): Documentation of the new :eval option.
* lisp/ob.el (org-babel-confirm-evaluate): Inhibit evaluation during
  export when eval is set to "non-export".

2 years agoNew option to update intermediate in-buffer results
Eric Schulte [Sun, 20 Nov 2011 20:19:01 +0000]
New option to update intermediate in-buffer results

* lisp/ob-ref.el (org-babel-update-intermediate): New custom variable.
  (org-babel-ref-resolve): Optionally update the in-buffer results of
  code blocks which are evaluated to resolve references.

2 years agoMore documentation of accumulated properties
Eric Schulte [Mon, 21 Nov 2011 16:19:23 +0000]
More documentation of accumulated properties

2 years ago* doc/org.texi: Add accumulated properties
Thomas Dye [Mon, 21 Nov 2011 04:27:09 +0000]
* doc/org.texi: Add accumulated properties

2 years agoorg-element: Parser for Org syntax
Nicolas Goaziou [Mon, 21 Nov 2011 07:11:47 +0000]
org-element: Parser for Org syntax

* contrib/lisp/org-element.el (org-element-center-block-parser,
  org-element-center-block-interpreter, org-element-drawer-parser,
  org-element-drawer-interpreter, org-element-dynamic-block-parser,
  org-element-headline-parser, org-element-headline-interpreter,
  org-element-inlinetask-parser, org-element-inlinetask-interpreter,
  org-element-item-parser, org-element-item-interpreter,
  org-element-plain-list-parser, org-element-plain-list-interpreter,
  org-element-babel-call-parser, org-element-babel-call-interpreter,
  org-element-comment-parser, org-element-comment-interpreter,
  org-element-keyword-parser, org-element-keyword-interpreter,
  org-element-paragraph-parser, org-element-paragraph-interpreter,
  org-element-src-block-parser, org-element-src-block-interpreter,
  org-element-table-parser, org-element-table-interpreter,
  org-element-verse-block-interpreter, org-element-emphasis-parser,
  org-element-text-markup-successor, org-element-entity-parser,
  org-element-line-break-parser, org-element-line-break-interpreter,
  org-element-line-break-successor, org-element-link-parser,
  org-element-link-interpreter, org-element-link-successor,
  org-element-macro-parser, org-element-macro-interpreter,
  org-element-macro-successor, org-element-radio-target-parser,
  org-element-subscript-parser, org-element-subscript-interpreter,
  org-element-superscript-interpreter, org-element-target-parser,
  org-element-target-interpreter, org-element-target-successor,
  org-element-time-stamp-parser, org-element-time-stamp-interpreter,
  org-element-time-stamp-successor, org-element-verbatim-parser,
  org-element-verbatim-interpreter, org-element-get-property,
  org-element-get-contents, org-element-at-point,
  org-element-guess-type, org-element-collect-affiliated-keywords,
  org-element-parse-buffer, org-element-parse-secondary-string,
  org-element-map, org-element-parse-elements,
  org-element-parse-objects, org-element-get-next-object-candidates,
  org-element-interpret-data, org-element-interpret-secondary,
  org-element-normalize-string, org-element-normalize-contents,
  org-element-swap-A-B, org-element-backward,
  org-element-drag-backward, org-element-drag-forward,
  org-element-forward, org-element-mark-element,
  org-narrow-to-element, org-transpose-elements,
  org-element-unindent-buffer, org-element-up): New functions.
(org-element-paragraph-separate, org-element-all-elements,
  org-element-greater-elements, org-element-all-successors,
  org-element-object-successor-alist, org-element-recursive-objects,
  org-element-multiple-keywords, org-element-parsed-keywords,
  org-element-dual-keywords, org-element-object-restrictions,
  org-element-string-restrictions, org-element--affiliated-re,
  org-element--element-block-types): New variables.

2 years agochanging documentation to reflect changing source code -- spaces around "="
Eric Schulte [Sun, 20 Nov 2011 17:09:18 +0000]
changing documentation to reflect changing source code -- spaces around "="

2 years ago* doc/org.texi: Documented no spaces in name=assign, another correction to :var table
Thomas Dye [Fri, 18 Nov 2011 06:34:21 +0000]
* doc/org.texi: Documented no spaces in name=assign, another correction to :var table

2 years agoMerge branch 'master' of
Eric Schulte [Sun, 20 Nov 2011 16:40:52 +0000]
Merge branch 'master' of

2 years agoAllow spaces around "=" in code block variable specifications
Eric Schulte [Sun, 20 Nov 2011 16:40:08 +0000]
Allow spaces around "=" in code block variable specifications

* lisp/ob.el (org-babel-join-splits-near-ch): Rejoins a list of a
  split string when a character appears on either side of the split.
  (org-babel-parse-multiple-vars): Rejoin splits around "=" signs.

2 years agomarked test as expected to pass, because it is now passing
Eric Schulte [Sun, 20 Nov 2011 16:39:09 +0000]
marked test as expected to pass, because it is now passing

2 years agoAdded a less functional Org-mode copy of the cl reduce function.
Eric Schulte [Sun, 20 Nov 2011 16:38:54 +0000]
Added a less functional Org-mode copy of the cl reduce function.

* lisp/org.el (org-reduce): Added a less functional Org-mode copy of
  the cl reduce function.

2 years agoFontify src blocks following a "name" keyword
Nicolas Goaziou [Sun, 20 Nov 2011 09:40:25 +0000]
Fontify src blocks following a "name" keyword

* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Recognize "name"
  as a valid keyword that can preceed a block.

2 years agodon't try to evaluate #+call lines in verbatim blocks
Eric Schulte [Fri, 18 Nov 2011 18:30:50 +0000]
don't try to evaluate #+call lines in verbatim blocks

* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Don't limit
  in-verbatim check to inline code blocks, do lob code blocks as well.
* testing/lisp/test-ob-lob.el (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export):
  Test ensuring that #+call lines in verbatim blocks are not evaluated