2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>

	* org.el (org-insert-link): Find the link buffer on visible
	frames.
	(org-export-latex-default-packages-alist): hyperref must be loaded
	late.
	(org-open-file): More care with the new matching for file links.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-preprocess): Do not yet protect
	defined entities - these will be taken care of later.
	(org-export-latex-special-chars): Post-process entity replacement.
	(org-export-latex-fontify-headline): Do not yet protect defined
	entities - these will be taken care of later.
	(org-export-latex-tables, org-export-latex-links): Format the
	caption properly.

	* org-entities.el (org-entities-user): Fix typo.

	* org.el (org-prepare-agenda-buffers): Uniquify TODO keywords

	* org-entities.el (org-entities-user): Improve docstring.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-entities.el (org-macs): Require org-macs, to be sure that we
	have `declare-function' defined.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-classes): Update docstring.

	* org.el (org-format-latex-header): Add cookies to the header.
	(org-splice-latex-header): Implement placement according to
	cookies.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-publish.el (org-publish-aux-preprocess): Control case
	sensitivity.

2010-04-10  Bastien Guerry  <bzg@altern.org>

	* org.el (org-splice-latex-header): Fix typo.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-make-header): Use
	`org-splice-latex-header' to build the header.
	(org-export-latex-classes): Update docstring.

	* org.el (org-splice-latex-header): New function.
	(org-create-formula-image): Use `org-splice-latex-header' to build
	the header.

	* org-gnus.el (org-gnus-follow-link): Handle nndoc backend.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-export-latex-packages-alist)
	(org-export-latex-default-packages-alist): Fix docstring to
	reflect the expected structure.

	* org-docbook.el (org-docbook-do-expand): Fix bug with variable names.
	(org-export-docbook-finalize-table): Make use of label for tables.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-attach.el (org-attach-commit): Split on newlines.

	* org.el (org-export-latex-default-packages-alist): Use list
	instead of cons for the entries.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-entities.el (org-entity-get-representation): Catch the case
	that there is not entry in the list.

	* org-mobile.el (org-mobile-use-encryption)
	(org-mobile-encryption-tempfile, org-mobile-encryption-password):
	New options.
	(org-mobile-check-setup): CHeck the encryption setup.
	(org-mobile-copy-agenda-files, org-mobile-sumo-agenda-command)
	(org-mobile-create-sumo-agenda): Use encryption code.
	(org-mobile-encrypt-and-move): New function.
	(org-mobile-encrypt-file, org-mobile-decrypt-file): New
	functions.
	(org-mobile-move-capture): Decrypt the capture file.

	* org.el (org-entities): Require the new file.
	(org-export-latex-default-packages-alist): New variable.
	(org-complete): Use new entity code for completion.
	(org-create-formula-image): Use the new packages variable.

	* org-latex.el (org-export-latex-classes): Remove the standard
	packages from the class headers.
	(org-export-latex-make-header): Use the new package variable.
	(org-export-latex-special-chars): Better regexp for entities, to
	support entity name that contain numbers.
	(org-export-latex-treat-backslash-char): Use the new entity code.

	* org-html.el (org-html-do-expand): Use the new entity code.

	* org-exp.el (org-export): Add the new export commands.
	(org-html-entities): Constant removed.
	(org-export-visible): Add the new export commands.

	* org-entities.el: New file.

	* org-docbook.el (org-docbook-do-expand): Use new entity code.

	* org-ascii.el (org-export-ascii-entities): New variable.
	(org-export-as-latin1, org-export-as-latin1-to-buffer)
	(org-export-as-utf8, org-export-as-utf8-to-buffer): New commands.
	(org-export-as-encoding): New function.
	(org-export-ascii-preprocess): Call `org-ascii-replace-entities'.
	(org-ascii-replace-entities): New function.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-html.el (org-html-level-start): Catch the case that target
	might be nil.

2010-04-10  Dan Davison  <davison@stats.ox.ac.uk>

	* org.el (org-appearance): Change Customize group variable name
	from org-font-lock to org-appearance, and change tag from "Org
	Font Lock" to "Org Appearance"
	(org-odd-levels-only): Change Customize group variable name
	(org-level-color-stars-only): Change Customize group variable name
	(org-hide-leading-stars): Change Customize group variable name
	(org-hidden-keywords): Change Customize group variable name
	(org-fontify-done-headline): Change Customize group variable name
	(org-fontify-emphasized-text): Change Customize group variable name
	(org-fontify-whole-heading-line): Change Customize group variable name
	(org-highlight-latex-fragments-and-specials): Change Customize
	group variable name
	(org-hide-emphasis-markers): Change Customize group variable name
	(org-emphasis-alist): Change Customize group variable name
	(org-emphasis-regexp-components): Change Customize group variable
	name
	(org-modules): Remove mention of org-R

	* org-faces.el (org-faces): Change Customize group variable name

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-diary-last-run-time): New variable.
	(org-diary): prepare agenda buffers only if last call was some
	time ago.

	* org-html.el (org-export-html-preprocess): Replace \ref macros
	with a link.
	(org-format-org-table-html): Add the label as an anchor.

	* org-docbook.el (org-export-docbook-format-image): Do some
	formatting on captions.

	* org-latex.el (org-export-latex-tables, org-export-latex-links):
	Do some formatting on captions.

	* org-html.el (org-export-html-format-image)
	(org-format-org-table-html): Do some formatting on captions.

2010-04-10  Dan Davison  <davison@stats.ox.ac.uk>

	* org.el (org-hidden-keywords): New customizable variable. This is
	a list of symbols specifying which of the special keywords #+DATE,
	#+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock.
	(org-fontify-meta-lines-and-blocks): Changes to font-lock code
	implementing new faces and hiding behaviour.

	* org-faces.el (org-document-title): New face for #+TITLE lines
	(org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines
	(org-document-info-keyword): New face for #+DATE, #+AUTHOR, #+EMAIL keywords

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-publish.el (org-publish-sanitize-plist): New function to
	rename "index" properties to "sitemap".  Do this renaming
	globally.
	(org-publish-with-aux-preprocess-maybe): New macro.
	(org-publish-org-to-pdf, org-publish-org-to-html): Use the new
	macro.
	(org-publish-aux-preprocess)
	(org-publish-index-generate-theindex.inc): New function.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-table.el (org-table-align): Interpret <N> at fixed width,
	not as maximum width.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-author-info, org-export-email-info): Fix
	docstrings.

	* org-beamer.el (org-beamer-select-environment): Renamed from
	`org-beamer-set-environment-tag'.  Improve docstring.

	* org-freemind.el (org-freemind-write-mm-buffer): Fix another
	problem with odd levels.

	* org-ascii.el (org-export-as-ascii): Export email only if the
	author wants it.

	* org-docbook.el (org-export-as-docbook): Export email only if the
	author wants it.

	* org-html.el (org-export-as-html): Export email only if the
	author wants it.

	* org-exp.el (org-export-email-info): New option.
	(org-export-plist-vars): Add entry for `org-export-email'.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-table.el (org-table-goto-line): Fix typo.

2010-04-10  Mikael Fornius  <mfo@abc.se>

	* org.el (org-agenda-files): Typo.
	(org-read-agenda-file-list): Add optional argument to help
	`org-store-new-agenda-file-list' to remember un-expanded file
	names.  Expand file names relative to `org-directory'.
	(org-store-new-agenda-file-list): Keep un-expanded file names when
	saving, if available.
	(org-agenda-files): Update documentation.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-ascii.el (org-export-as-ascii): Catch the case of exporting
	a buffer with no file name attached.

	* org.el (org-log-refile): New option.
	(org-log-note-headings): Add a heading for refiling.
	(org-startup-options): Add keywords for logging of the refile
	action.
	(org-refile): Add logging action.
	(org-add-log-note): Allow for refiling action.

	* org-agenda.el (org-agenda-bulk-action): Make sure
	`org-log-refile' is not `note' during a bulk action.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-map-dblocks): Use save-excursion to remember the
	position.

	* org-attach.el (org-attach-commit): Remove dependence on xargs.
	(org-attach-delete-one): Commit after deleting a file.

	* org-latex.el (org-export-latex-fontify): Do not mistake table.el
	borders for strike-through emphasis.

	* org-freemind.el (org-freemind-write-mm-buffer): Simplify the
	handling of odd levels.

	* org-agenda.el (org-agenda-todo-ignore-deadlines): Document `past'
	and `future' values.
	(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
	Handle `past' and `future' values.

	* org.el (org-read-agenda-file-list): Interpret file names
	relative to org-directory and allow environment variables and
	"~".

	* org-latex.el (org-export-latex-special-chars): Allow a
	parenthesis before an exponent or subscript.

2010-04-10  Dan Davison  <davison@stats.ox.ac.uk>

	* org-src.el (org-edit-src-exit): When returning from code edit
	buffer, if code block is hidden, leave point at start of
	#+begin_src line

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-insert-heading): Do not remove all spaces if the
	headline is empty.

	* org-indent.el (org-indent): Fix group name.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-table.el (org-table-goto-column): Fix forcing a non-existing
	column.
	(org-table-get, org-table-put, org-table-goto-line)
	(org-table-current-line): New functions.

2010-04-10  Jan Böcker  <jan.boecker@jboecker.de>

	* org.el (org-open-file): Allow regular expressions in
	org-file-apps to capture link parameters using groups.  In a
	command string to be executed, the parameters can be referenced
	using %1, %2, etc.  Lisp forms can access them using
	(match-string n link).
	(org-apps-regexp-alist): Adopt the created regexp, as this is now
	matched against a file: link instead of the file name.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-crypt.el (org-reveal-start-hook): Add a decryption function
	to this hook.
	(org-decrypt-entries, org-encrypt-entries, org-decrypt-entry): Add
	docstrings.

	* org.el (org-point-at-end-of-empty-headline)
	(org-level-increment, org-get-previous-line-level): New function.
	(org-cycle-level): Rewritten to be independent of when this
	function is called.
	(org-in-regexps-block-p): New function.
	(org-reveal-start-hook): New hook.
	(org-reveal): Run new hook.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-keywords): Start a new paragraph
	after time keywords, do not add "\newline".

	* org-html.el (org-export-as-html): Avoid double # in href.

	* org.el (org-refile-get-location): Catch an invalid target
	specification.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
	Make sure the behavior regarding to extracting time is
	consistent.

2010-04-10  Stephen Eglen  <stephen@gnu.org>

	* org-agenda.el (org-agenda-insert-diary-extract-time): New
	variable.
	(org-agenda-add-entry-to-org-agenda-diary-file): Use this new
	variable rather than `org-agenda-search-headline-for-time'.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-list.el (org-fix-bullet-type): Improve cursor positioning.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-adaptive-fill-regexp-backup): New variable.
	(org-set-autofill-regexps): Store a backup of
	`adaptive-fill-regexp'.
	(org-adaptive-fill-function): Fix filling of comments and ordered
	lists. If there is no other match, till try adaptive fill.

2010-04-10  John Wiegley  <jwiegley@gmail.com>

	* org-agenda.el (org-agenda-include-deadlines): Added new
	customization variable to determine whether unscheduled tasks
	should appear in the agenda solely because of their deadline.
	Default to true, which was the previous behavior (it just wasn't
	configurable).
	(org-agenda-mode-map, org-agenda-view-mode-dispatch): Bind ! in
	the agenda to show/hide deadline tasks.
	(org-agenda-menu): Added menu option for show/hide deadlines.
	(org-agenda-list): Make the agenda list sensitive to the value of
	`org-agenda-include-deadlines'.
	(org-agenda-toggle-deadlines): New function to toggle the value of
	`org-agenda-include-deadlines' and repaint the modeline
	indicators.
	(org-agenda-set-mode-name): Show "Deadlines" in the agenda
	modeline if deadline tasks are being displayed.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-table.el (org-table-eval-formula): Replace $# and @# by
	current column and row number.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-set-property, org-delete-property): Go back to
	prompting for the property.

	* org-latex.el (org-export-latex-make-header): Fully process
	author line.
	(org-export-latex-fontify-headline): Allow several arguments, not
	just one.
	(org-export-latex-fix-inputenc): Catch the error when
	`latexenc-coding-system-to-inputenc' is not defined.

	* org-agenda.el (org-agenda-skip-if-todo): New function.
	(org-agenda-skip-if): Add conditions for TODO keywords.
	(org-agenda-skip-if): Document the new todo conditions.

2010-04-10  Mikael Fornius  <mfo@abc.se>

	* org.el (org-at-property-p): Check if we are inside a property
	drawer not just any drawer.
	(org-set-property, org-delete-property): When cursor is on a
	property key value pair do not prompt for property name instead
	use name at cursor.
	(org-ctrl-c-ctrl-c): Still do org-property-action when cursor is
	on the first line of a property drawer.
	(org-property-end-re): Spell check.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-attach-captions-and-attributes): Add the
	properties to the entire table, in case the first line is
	removed.

	* org-archive.el (org-archive-reversed-order): New option.
	(org-archive-subtree, org-archive-to-archive-sibling): Use the new
	option `org-archive-reversed-order'.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-entry-types): New variable.
	(org-agenda-list): Use `org-agenda-entry-types'.
	(org-agenda-custom-commands-local-options): Support for setting
	`org-agenda-entry-types' as an option.
	(org-diary): Shift some documentation from here to the variable
	`org-agenda-entry-types'.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-make-header): Apply macros in
	author field.

	* org-clock.el (org-clocking-buffer, org-clocking-p): New function.
	(org-clock-select-task, org-clock-notify-once-if-expired)
	(org-clock-in, org-clock-out, org-clock-cancel, org-clock-goto)
	(org-clock-out-if-current, org-clock-save): Use the new functions.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-docbook.el (org-export-as-docbook): Remove unnecessary
	newline.
	(org-export-as-docbook): Remove unnecessary newline.
	(org-export-as-docbook): Fix problem with double footnote
	reference in one place.

	* org-exp.el (org-export-format-source-code-or-example): Remove
	unnecessary newline.

	* org.el (org-deadline, org-schedule): Allow rescheduling entries
	with repeaters.

	* org-table.el (org-table-convert-refs-to-rc): Better way to catch
	function calls that look like references.

	* org.el (org-open-at-point): Get link abbreviations from
	reference buffer.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-table.el (org-table-convert-refs-to-rc): Do not read arctan2
	as a reference.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-link-unescape): Solve issue with lower-case escapes.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-classes): Add
	\usepackage{latexsym} to all classes.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-html.el (org-export-as-html): Do not allow protected lines
	into the table of contents.

	* org-latex.el (org-export-latex-special-chars): Find subsequent
	occurrences of special characters.
	(org-export-latex-tables): Do not convert table-like stuff that is
	protected.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-list.el (org-toggle-checkbox): No errors when updating
	checkbox count fails because there is no heading.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-clock.el (org-clock-report-include-clocking-task): New
	option.
	(org-clock-sum): Add the current clocking task.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-cycle): Print a message when in a table.el table.
	(org-edit-special): Recognize the table.el context.
	(org-ctrl-c-ctrl-c): Print a message when in a table.el table.

	* org-src.el (org-at-table.el-p): Declare.
	(org-edit-src-code): Handle a special case for table.el editing.
	(org-edit-src-find-region-and-lang): Recognize the table.el
	context.

	* org-latex.el (org-export-latex-tables): Convert table.el
	tables.
	(org-export-latex-convert-table.el-table): New function.

	* org-html.el (org-html-expand): Fix table.el export.

	* org-latex.el (org-export-latex-preprocess): Protect footnotes in
	headings.

	* org-id.el (org-id-find-id-file): Fix bug when there is no hash
	table for the id locations.

	* org.el (org-read-date-analyze): Match American-style dates, like
	5/30 or 5/13/7.  Make sure cal-iso.el is loaded.  Don't force he
	current year when reading ISO and American dates.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-face-from-face-or-color): New function.
	(org-get-todo-face, org-font-lock-add-priority-faces)
	(org-get-tag-face): Use `org-face-from-face-or-color'.

	* org-faces.el (org-todo-keyword-faces, org-priority-faces): Allow
	simple colors as values.
	(org-faces-easy-properties): New option.

	* org-agenda.el (org-agenda-set-mode-name): Show if the agenda is
	restricted, as an agenda mode.
	(org-agenda-fontify-priorities): Allow simple colors as values.

2010-04-10  Bastien Guerry  <bzg@altern.org>

	* org-timer.el (org-timer-current-timer): Renamed from
	`org-timer-last-timer'.
	(org-timer-timer1, org-timer-timer2, org-timer-timer3): Removed.
	(org-timer-cancel-timer, org-timer-show-remaining-time)
	(org-timer-set-timer): Update to use only one timer.

	* org.el (org-set-property): Remove useless space in the prompt.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-html.el (org-export-html-style-default): Add a default style
	for textareas.

	* org-exp.el (org-export-format-source-code-or-example): Fix
	textarea tag.

2010-04-10  Bastien Guerry  <bzg@altern.org>

	* org-clock.el (org-clock-current-task): New variable to store
	last clocked in task.
	(org-clock-set-current, org-clock-delete-current): New functions.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-remember.el (org-remember-apply-template): Extend comment.
	(org-remember-handler): Implement clock sibling filing.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-publish.el (org-publish-all, org-publish-current-file)
	(org-publish-current-project): When called with prefix argument
	FORCE, also rebuild the validation file list.

	* org-latex.el (org-export-latex-preprocess): Protect footnotes in
	section headings.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-html.el (org-export-as-html-and-open): Kill product buffer
	if the user wants that.

	* org-latex.el (org-export-as-pdf-and-open): Kill product buffer
	if the user wants that.

	* org-exp.el (org-export-kill-product-buffer-when-displayed): New
	option.

	* org-agenda.el (org-batch-agenda-csv): Use the time property
	instead of the `time-of-day' property.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-timer.el (org-timer-start-hook, org-timer-stop-hook)
	(org-timer-pause-hook, org-timer-set-hook)
	(org-timer-cancel-hook): New hooks.
	(org-timer-start): Run `org-timer-start-hook'.
	(org-timer-pause-or-continue): Run `org-timer-pause-hook'.
	(org-timer-stop): Run `org-timer-stop-hook'.
	(org-timer-cancel-timers): Run `org-timer-cancel-hook'.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-reveal): Double prefix arg shows the subtree of the
	parent.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-search-view): Fix bug with searching full
	words in headlines in search view.
	(org-agenda-skip-deadline-prewarning-if-scheduled): New option.
	(org-agenda-get-deadlines): Suppress pre-warning if the entry is
	scheduled (if the user configures it so.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-hide-archived-subtrees): Don't jump to end of
	subtree if the match was not in a headline.
	(org-inside-latex-macro-p): Allow more complex arguments.
	(org-emphasize): Protect against use at end of buffer.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-align-tags): Avoid side effects on
	text properties.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-todo-ignore-scheduled): More allowed
	values.
	(org-agenda-todo-ignore-scheduled)
	(org-agenda-todo-ignore-deadlines): More control with different
	allowed values.
	(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
	Honor the new option settings.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-get-location): Make sure the selection buffer is
	shown in the current frame.

	* org-ascii.el (org-export-ascii-table-widen-columns): New
	option.
	(org-export-ascii-preprocess): Realign tables to remove narrowing
	if `org-export-ascii-table-widen-columns' is set.

	* org-table.el (org-table-do-narrow): New variable.
	(org-table-align): Narrow only if `org-table-do-narrow' is t.

	* org.el (org-deadline, org-schedule): Allow updating if the
	relevant time stamp does not have a repeater, i.e. do not require
	that no time stamp has a repeater.

	* org-agenda.el (org-agenda-align-tags): Don't add a face to the
	new white space before the tags.

	* org-latex.el (org-export-as-latex): Do nit require the buffer to
	be visiting a file when only exporting to a buffer or string.
	(org-export-latex-fix-inputenc): Only save the buffer is there is
	a file name attached to it.

2010-04-10  Dan Davison  <davison@stats.ox.ac.uk>

	* org-src.el (org-edit-src-exit): Widen before exiting edit buffers

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-fontify-meta-lines-and-blocks): Honor
	`org-fontify-quote-and-verse-blocks'.

	* org-faces.el (org-fontify-quote-and-verse-blocks): New option.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-open-at-point): Also check for text property
	org-linked-text before offering collected links.

2010-04-10  Stephen Eglen  <stephen@gnu.org>

	* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
	Optionally extract time specification from text and add to the
	timestamp.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-html-entities): Fix typo.

	* org-latex.el (org-export-latex-make-header): Use \providecommand
	to make sure the \alert macro is defined.

	* org.el (org-format-latex-signal-error)
	(org-create-formula-image): Use `org-format-latex-signal-error'.

2010-04-10  Stephen Eglen  <stephen@gnu.org>

	* org.el (org-store-link): For dired buffers, use
	default-directory as link name if dired-get-filename returns
	nil.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-concatenate-multiline-links): The for
	protectedness at beginning of match.

	* org-latex.el (org-export-latex-fix-inputenc): Never leave the
	AUTO as a coding system, instead default to utf8.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-block-todo-from-children-or-siblings-or-parent)
	(org-block-todo-from-checkboxes): Respect the local variable
	value when deciding if blocking should be active.

	* org-latex.el (org-export-latex-make-header): Define the align
	macro if it is not yet defined.

	* org-agenda.el (org-agenda-insert-diary-make-new-entry): Call
	`org-insert-heading' with the INVISIBLE-OK argument.

	* org-mac-message.el (org-mac-message-insert-flagged): Call
	`org-insert-heading' with the INVISIBLE-OK argument.

	* org.el (org-insert-heading):  New argument INVISIBLE-OK.

	* org-agenda.el (org-agenda-view-mode-dispatch): Improve the
	prompt message.

	* org-html.el (org-html-level-start): Use the
	`html-container-class' text property to set an additional class
	for an outline container.

	* org-exp.el (org-export-remember-html-container-classes): New
	function.
	(org-export-preprocess-string): Call
	`org-export-remember-html-container-classes'.

	* org.el (org-cycle): Mention level cycling in the docstring.
	(org-default-properties): Add new property HTML_CONTAINER_CLASS.

	* org-remember.el (org-remember-apply-template): Do file insertion
	first.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-habit.el (org-habit-insert-consistency-graphs): Fix a
	problem with mis-aligned graphs when showing habits.

2010-04-10  Mikael Fornius  <mfo@abc.se>

	* org.el (org-assign-fast-keys): Prefer keys used in keyword name
	when assigning. Begin using numerical characters when all in name
	is used up. This is to spare alphanumeric characters for better
	match with other keywords.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-preprocess-hook): Improve documentation.

	* org-latex.el (org-export-latex-preprocess): More consistent
	conversion and protection of the words LaTeX and TeX.
	(org-export-latex-fontify-headline, org-export-latex-preprocess):
	Allow angle brackets in commands, for beamer.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-clock.el (org-clock-in): Improve the look of the clock line
	by formatting links.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-classes): Use AUTO as the place
	holder string for the coding system.  And improve the
	documentation.
	(org-export-latex-fix-inputenc): Only modify the coding system if
	it is given by the placeholder AUTO.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-clock.el (org-task-overrun-text): New option.
	(org-task-overrun, org-clock-update-period): New variables.
	(org-clock-get-clock-string, org-clock-update-mode-line): Mark
	overrun clock.
	(org-clock-notify-once-if-expired): Check if clock is overrun.

	* org-faces.el: New face `org-mode-line-clock-overrun'.

2010-04-10  Jan Böcker  <jan.boecker@jboecker.de>

	* org.el (org-narrow-to-subtree): Position the end of the narrowed
	region before the line with the next heading, to prevent the user
	from prepending text to the next headline.

2010-04-10  Stephen Eglen  <stephen@gnu.org>

	* org-agenda.el (org-get-time-of-day): Use
	org-agenda-time-leading-zero to allow leading zero (rather than
	space) for times.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
	org-datetree.el is loaded.

	* org-datetree.el: autoload `org-datetree-find-day-create'

	* org-latex.el (org-export-latex-hyperref-format): New option.
	(org-export-latex-links): Use `org-export-latex-hyperref-format'.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-ctags.el (org-ctags-enable): Change order of functions.
	(org-ctags-create-tags): Add wildcard to file name expansion.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-entry-properties): Fix some important bugs.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-link-unescape, org-link-escape): Only use hexlify if
	the table is not explicitly given.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-clock.el (org-clock-out-when-done): Allow a list of keywords
	as value.
	(org-clock-out-if-current): Work with the new list value of
	`org-clock-out-when-done'.
	(org-clock-out, org-clock-out-if-current): Avoid circular logic
	between clocking out and state changes.

	* org-ctags.el (org-ctags-path-to-ctags): Better system-type test.

	* org-latex.el (org-export-latex-treat-backslash-char): Do not by
	accident protect a character that is before a backslash.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-diary-class): Use
	`org-order-calendar-date-args'.

	* org.el (org-order-calendar-date-args): New function.

	* org-exp.el (org-export-target-internal-links): Check for
	protectedness after the first bracket.

	* org.el (org-entry-properties): Don't match wrong-case TODO
	keywords.

	* org-agenda.el (org-agenda-schedule, org-agenda-deadline):
	Document that ARG is passed through to remove the date.
	(org-agenda-bulk-action): Accept prefix arg and pass it on.  Do
	not read a date when the user has given a `C-u' prefix.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-fix-displayed-tags): Fix bug when all
	tags are hidden.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-fix-inputenc): New function.
	(org-export-latex-inputenc-alist): New option.

	* org-exp.el (org-export): New key SPC to publish enclosing
	subtree.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-indent.el (org-indent-add-properties): Catch case when there
	is no headline in the buffer.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-html-entities): Add checkmark symbol.

	* org-ascii.el (org-export-ascii-preprocess): Protect targets in
	verbatim code for ASCII export.

	* org.el (org-update-statistics-cookies): Also see checkboxes in
	ordered lists.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-view-mode-dispatch): Define the `L'
	key.

	* org-beamer.el (org-beamer-amend-header): Change the location
	where `org-beamer-header-extra' is inserted.

	* org.el (org-compute-latex-and-specials-regexp): Don't do BIND
	just for computing this regexp.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-beamer.el (org-beamer-frame-default-options): New option.
	(org-beamer-sectioning): Use default options if the user does not
	have defined any.
	(org-beamer-fix-toc): Put a frame around the table of contents.

	* org-exp.el (org-export-remove-comment-blocks-and-subtrees): Make
	sure case-folding works well when processing comment stuff.

	* org-latex.el (org-export-latex-after-save-hook): New hook.
	(org-export-as-latex): Run the new hook.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-beamer.el (org-beamer-environments-default): Add the note
	environments.
	(org-beamer-after-initial-vars): Allow several BEAMER_HEADER_EXTRA
	lines and collect and combine the content.
	(org-beamer-after-initial-vars): Check for note tags and make sure
	they will be seen like a property.

	* org.el (org-offer-links-in-entry): Fix bug when there is a
	single link.

	* org-exp.el (org-export): Make sure the mark is activated, also
	when `transient-mark-mode' is off.

	* org-agenda.el (org-agenda-search-view-always-boolean): New option.
	(org-agenda-search-view-search-words-only): Obsolete variable, is
	now an alias for `org-agenda-search-view-always-boolean'.
	(org-agenda-search-view-force-full-words): New option.
	(org-search-view): Improve docstring, and implement a better logic
	for Boolean and phrase searches.
	(org-agenda-last-search-view-search-was-boolean): New variable.
	(org-agenda-manipulate-query): Consider the type of the last
	search when modifying the search string.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-as-latex): Do the first letbind in the
	right moment.

	* org-agenda.el (org-get-entries-from-diary): Add the new face to
	these entries.

	* org-faces.el (org-agenda-diary): New face.

	* org.el (org-make-link-regexps): Allow regexp-special characters
	in link types.
	(org-open-file): When in-emacs is `system', also force system
	opening, like when the value was `(16)'.
	(org-update-statistics-cookies): Handle entries without children.

	* org-exp.el
	(org-export-preprocess-before-normalizing-links-hook): New hook.
	(org-export-preprocess-string): Run the new hook.

	* org.el (org-offer-links-in-entry): Make RET open all links.

	* org-html.el (org-export-as-html): Remove any leftover display
	properties in the html file.

	* org-wl.el (org-wl-store-link): Work-around for format bug with
	text properties.

	* org-habit.el (org-habit-insert-consistency-graphs): Turn off
	invisibility while adding the graphs.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-remember.el (org-select-remember-template): Use C letter to
	customize remember templates.

	* org-agenda.el (org-agenda-bulk-mark, org-agenda-bulk-unmark):
	Move cursor to next visible line.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-beamer.el (org-beamer-sectioning): Leave columns environment
	by specifying 0 or 1 for column width.
	(org-beamer-column-widths): Make 0 stand for 0.0.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-mark-radio-links): Don't match inside
	<<target>>.

	* org.el (org-format-latex-header-extra): New variable.
	(org-format-latex): Set org-format-latex-header-extra from
	in-buffer stuff.
	(org-format-latex): Add org-format-latex-header-extra to the
	variables on which image creation depends.
	(org-create-formula-image): Add the header stuff from in-buffer
	settings.
	(org-read-date-analyze): Base the analysis for future preference
	on NOW, not on the default date.

	* org-inlinetask.el (org-inlinetask-export-handler): Add CSS class
	for TODO keyword in inline tasks.

	* org.el (org-log-note-headings): New headings for removing
	deadline or scheduling date.
	(org-deadline, org-schedule): Arrange for logging when removing a
	date.
	(org-add-log-note): Handle deadline and scheduling removal.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-visible): Add LaTeX/pdf export.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-diary-class): New function.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-preprocess): Do process the text
	of a radio target.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-entry-properties): Add TIMESTAMP properties back
	in.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-all-time-keywords): New variable.
	(org-set-regexps-and-options): Set `org-all-time-keywords'.
	(org-entry-blocked-p): New function.
	(org-special-properties): Add BLOCKED as a new special property.
	(org-entry-properties): New optional argument SPECIFIC, only parse
	for this property when it is specified.
	(org-entry-get): Pass a SPECIFIC argument to
	`org-entry-properties'.

	* org-latex.el (org-export-as-latex): Preprocess TEXT as well.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-tables): No forced line end if
	there is no caption.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-html-entities): Add Euro symbols from Marvosym
	package.

	* org-latex.el (org-export-latex-tables): Only add a caption when
	macro in in longtable environments if one has been defined.

	* org-html.el (org-export-as-html): Only take title from buffer if
	not exporting body-only.

	* org-latex.el (org-export-latex-preprocess): Better version of
	the regular expression for protecting LaTeX macros.
	(org-export-latex-preprocess): Start searching for macros to
	protect from beginning of buffer.

	* org-exp.el (org-export-target-internal-links): Check for
	protectedness earlier in the string.

	* org-agenda.el (org-agenda-highlight-todo): Match TODO keywords
	case sensitively.

	* org-id.el (org-id-store-link): Match TODO keywords case
	sensitively.

	* org.el (org-heading-components, org-get-outline-path)
	(org-display-outline-path): Match TODO keywords case sensitively.

	* org-latex.el (org-export-as-latex): Ignore read-only
	properties.

	* org-exp.el (org-export-preprocess-string): Remove any
	`read-only' properties.

	* org-agenda.el (org-agenda-inactive-leader): New option.
	(org-agenda-get-timestamps): Use `org-agenda-inactive-leader'.
	(org-tags-view): Prompt for matcher if MATCH is an empty string.
	(org-todo-list): Prompt for matcher if ARG is an empty string.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-open-link-functions): New hook.
	(org-open-at-point): Run `org-open-link-functions'.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-date-prompt): Allow inactive time
	stamps as well.

	* org.el (org-inhibit-startup-visibility-stuff): New variable.
	(org-mode): Don't do startup visibility if inhibited.
	(org-outline-overlay-data, org-set-outline-overlay-data): New
	functions.
	(org-save-outline-visibility): New macro.
	(org-log-note-headings): Document that one should not change the
	`state' note format.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-make-link-regexps): Capture link path into a group.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-beamer.el (org-beamer-after-initial-vars): Do not overwrite
	the options plist.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-startup-with-beamer-mode): New option.
	(org-property-changed-functions)
	(org-property-allowed-value-functions): New hooks.
	(org-entry-put, org-property-get-allowed-values): Run the new
	hooks.
	(org-property-next-allowed-value): Run the new hooks.

	* org-exp.el (org-export-select-backend-specific-text): Add the
	special beamer tags.

	* org-beamer.el
	(org-export-preprocess-before-selecting-backend-code-hook): New
	file.

	* org-latex.el (org-export-latex-after-initial-vars-hook): New hook.
	(org-export-as-latex): Run
	`org-export-latex-after-initial-vars-hook'.
	(org-export-latex-format-toc-function)
	(org-export-latex-make-header): Call
	`org-export-latex-format-toc-function'.

	* org.el (org-fill-template): Make template searches case sensitive.

	* org-exp.el (org-export): Use "1" as a sign to export only the
	subtree.

	* org-colview-xemacs.el (org-columns-edit-value): Use
	org-unrestricted property.

	* org-colview.el (org-columns-edit-value):  Use
	org-unrestricted property.

	* org.el (org-compute-property-at-point): Set org-unrestricted
	text property if the list contains ":ETC".
	(org-insert-property-drawer):  Use
	org-unrestricted property.

	* org-exp.el
	(org-export-preprocess-before-selecting-backend-code-hook): New hook.
	(org-export-preprocess-string): Run
	`org-export-preprocess-before-selecting-backend-code-hook'.

	* org-xoxo.el (org-export-as-xoxo): Run `org-export-first-hook'.

	* org-latex.el (org-export-region-as-latex): Run
	`org-export-first-hook'.

	* org-html.el (org-export-as-html): Run `org-export-first-hook'.

	* org-docbook.el (org-export-as-docbook): Run
	`org-export-first-hook'.

	* org-ascii.el (org-export-as-ascii): Run `org-export-first-hook'.

	* org-exp.el (org-export-first-hook): New hook.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-list.el (org-previous-item): Exit at the beginning of the
	buffer.

	* org-id.el (org-id-locations-save): Only write the id locations
	if any are defined.

	* org-archive.el (org-archive-all-done): Make this work in a file
	with org-odd-levels-only set.

	* org.el (org-get-refile-targets): Catch the case when a buffer
	has no file.

	* org-latex.el (org-export-as-latex): Cleanup forced line ends
	where they are not needed.
	(org-export-latex-subcontent): Remove unnecessary newlines.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-make-header): Remove \obeylines.
	(org-export-latex-fontify): Fix regexp bug that takes special
	care of protecting the right boundary characters in emphasis
	matches.
	(org-export-latex-preprocess): Allow multiple arguments to latex
	macros.

	* org.el (org-make-link-regexps): Use John Gruber's regexp for
	urls.

	* org-macs.el (org-re): Interpret :punct: in regexps.

	* org-exp.el (org-export-replace-src-segments-and-examples): Also
	take the final newline after the END line.

	* org.el (org-clean-visibility-after-subtree-move): Only fix
	entries that are not entirely invisible already.
	(org-insert-link): Respect org-link-file-path-type for
	"docview:" links in addition to "file:" links.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-format-source-code-or-example): Avoid
	additional extra white lines in LaTeX.

	* org-list.el (org-list-parse-list): Leave empty lines after the
	list, don't consider them as part of the list.

	* org-mobile.el (org-mobile-sumo-agenda-command): Allow tagstodo
	searches.

	* org-clock.el (org-clock-select-task): Convert integer to
	character for XEmacs.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-clock.el (org-clock-resolve): Make reading a char XEmacs
	compatible.

2010-04-10  Tassilo Horn  <tassilo@member.fsf.org>

	* org.el (org-complete-tags-always-offer-all-agenda-tags): New
	variable.
	(org-set-tags): Use it.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-list.el (org-empty-line-terminates-plain-lists): Update
	docstring.

	* org.el (org-format-latex): Fix link creation for processed latex
	snippets.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-footnote.el (org-footnote-normalize): Protect replacement
	text.

	* org.el (org-inside-latex-macro-p): Save match data.

2010-04-10  Jan Böcker  <jan.boecker@jboecker.de>

	* org-docview.el: New file.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-class-options): New variable.
	(org-export-latex-set-initial-vars): Use the class options.

	* org.el (org-forward-same-level): Stop at headings that start
	with an invisible character.
	(org-additional-option-like-keywords): Add LaTeX_CLASS_OPTIONS.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-footnote.el (org-footnote-normalize): Don't take optional
	arguments in LaTeX macros as footnotes.

	* org.el (org-inside-latex-macro-p): New function.

	* org-latex.el (org-latex-to-pdf-process): Change customization
	group to `org-export-pdf'.

	* org-agenda.el (org-agenda-get-blocks): Look at time string also
	on days after the first one.

	* org.el (org-insert-heading): Also check for item before assuming
	before-first-heading condition.

	* org-latex.el (org-latex-to-pdf-process): Fix typo in group tag.
	(org-export-pdf-logfiles): New option.
	(org-export-as-pdf): Use `org-export-pdf-logfiles'.
	(org-export-pdf-logfiles): Fix customization type.

	* org.el (org-insert-link): Improve error message when there is no
	default link to select with RET.

	* org-agenda.el (org-agenda-filter-by-tag): Use char argument from
	parameter list.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-parse-global)
	(org-export-latex-parse-content)
	(org-export-latex-parse-subcontent): Use
	`org-re-search-forward-unprotected'.
	(org-export-as-pdf): Remove log files produced by XeTeX.

	* org-macs.el (org-re-search-forward-unprotected): New function.

2010-04-10  James TD Smith  <ahktenzero@mohorovi.cc>

	* org-colview.el (org-agenda-colview-summarize): Sort out some
	confusion between properties and titles, which resulted in
	agenda summaries not working if a title was set for a column.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-mobile.el (org-mobile-agendas): New option.
	(org-mobile-sumo-agenda-command): Select the right agendas.

	* org-latex.el (org-export-latex-format-image): Preserve the
	original-indentation property.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-clock.el (org-clock-insert-selection-line): Catch error when
	an old tasks no longer exists.

	* org-latex.el (org-export-as-pdf): Remove also the .idx file.
	(org-export-as-pdf): Don't remove the old PDF file before making
	the new one.

	* org-mouse.el (org-mouse-end-headline, org-mouse-insert-item)
	(org-mouse-context-menu): Use `org-looking-back'.

	* org.el (org-cycle-level): Use `org-looking-back'.

	* org-list.el (org-cycle-item-indentation): Use
	`org-looking-back'.

	* org-compat.el (org-looking-back): New function.

	* org.el (org-insert-heading): Catch before-first-headline when
	inserting a headline.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-format-image): Indent figure
	environment, so that it does not interrupt plain list.

	* org.el (org-open-at-point): Allow long link descriptions.

2010-04-10  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-html.el (org-export-as-html): Remove empty lines at the
	beginning of the exported text.



2010-04-15  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.texi (LaTeX and PDF export): Add a footnote about xetex.
	(LaTeX/PDF export commands): Section renamed and
	moved.
	(Sectioning structure): Update.
	(References): New use case for field coordinates.
	(The export dispatcher): Renamed from ASCII export.
	(Setting up the staging area): Document the availability of
	encryption for MobileOrg.
	(Images and tables): Document how to reference labels.
	(Index entries): New section.
	(Generating an index): New section.
	(Column width and alignment): Document that <N> now
	means a fixed width, not a maximum width.
	(Publishing options): Document the :email option.
	(Beamer class export): Fix bug in the BEAMER example.
	(Refiling notes): Document refile logging.
	(In-buffer settings): Document refile logging keywords.
	(Drawers): Document `C-c C-z' command.
	(Agenda commands): Mention the alternative key `C-c C-z'.
	(Special properties): Document the BLOCKED property.
	(The spreadsheet): Mention the formula editor.
	(References): Document field coordinates.
	(Publishing action): Correct the documentation for the
	publishing function.
	(The date/time prompt): Document that we accept dates
	like month/day/year.
	(Cooperation): Document the changes in table.el support.
	(Faces for TODO keywords, Faces for TODO keywords)
	(Priorities): Document the easy colors.
	(Visibility cycling): Document the new double prefix
	arg for `org-reveal'.
	(Cooperation): Remember.el is part of Emacs.
	(Clean view): Mention that `wrap-prefix' is also set by
	org-indent-mode.
	(Agenda commands): Add information about prefix args to
	scheduling and deadline commands.
	(Search view): Point to the docstring of
	`org-search-view' for more details.
	(Agenda commands): Document that `>' prompts for a
	date.
	(Setting tags): Document variable
	org-complete-tags-always-offer-all-agenda-tags.
	(Column attributes): Cross-reference special
	properties.

1 files changed, 495 insertions, 178 deletions

diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index ffec1be7a56..4241fd20f7f 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-latex.el
-;; Version: 6.33x
+;; Version: 6.35i
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
@@ -50,9 +50,11 @@
 (require 'org)
 (require 'org-exp)
 (require 'org-macs)
+(require 'org-beamer)
 
 ;;; Variables:
 (defvar org-export-latex-class nil)
+(defvar org-export-latex-class-options nil)
 (defvar org-export-latex-header nil)
 (defvar org-export-latex-append-header nil)
 (defvar org-export-latex-options-plist nil)
@@ -89,53 +91,30 @@
 
 (defcustom org-export-latex-classes
   '(("article"
-     "\\documentclass[11pt]{article}
-\\usepackage[utf8]{inputenc}
-\\usepackage[T1]{fontenc}
-\\usepackage{graphicx}
-\\usepackage{longtable}
-\\usepackage{float}
-\\usepackage{wrapfig}
-\\usepackage{soul}
-\\usepackage{amssymb}
-\\usepackage{hyperref}"
+     "\\documentclass[11pt]{article}"
      ("\\section{%s}" . "\\section*{%s}")
      ("\\subsection{%s}" . "\\subsection*{%s}")
      ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
      ("\\paragraph{%s}" . "\\paragraph*{%s}")
      ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
     ("report"
-     "\\documentclass[11pt]{report}
-\\usepackage[utf8]{inputenc}
-\\usepackage[T1]{fontenc}
-\\usepackage{graphicx}
-\\usepackage{longtable}
-\\usepackage{float}
-\\usepackage{wrapfig}
-\\usepackage{soul}
-\\usepackage{amssymb}
-\\usepackage{hyperref}"
+     "\\documentclass[11pt]{report}"
      ("\\part{%s}" . "\\part*{%s}")
      ("\\chapter{%s}" . "\\chapter*{%s}")
      ("\\section{%s}" . "\\section*{%s}")
      ("\\subsection{%s}" . "\\subsection*{%s}")
      ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))
     ("book"
-     "\\documentclass[11pt]{book}
-\\usepackage[utf8]{inputenc}
-\\usepackage[T1]{fontenc}
-\\usepackage{graphicx}
-\\usepackage{longtable}
-\\usepackage{float}
-\\usepackage{wrapfig}
-\\usepackage{soul}
-\\usepackage{amssymb}
-\\usepackage{hyperref}"
+     "\\documentclass[11pt]{book}"
      ("\\part{%s}" . "\\part*{%s}")
      ("\\chapter{%s}" . "\\chapter*{%s}")
      ("\\section{%s}" . "\\section*{%s}")
      ("\\subsection{%s}" . "\\subsection*{%s}")
-     ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))
+     ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))
+    ("beamer"
+     "\\documentclass{beamer}"
+     org-beamer-sectioning
+     ))
   "Alist of LaTeX classes and associated header and structure.
 If #+LaTeX_CLASS is set in the buffer, use its value and the
 associated information.  Here is the structure of each cell:
@@ -145,11 +124,59 @@ associated information.  Here is the structure of each cell:
     (numbered-section . unnumbered-section\)
     ...\)
 
-A %s formatter is mandatory in each section string and will be
-replaced by the title of the section.
+The header string
+-----------------
+
+The HEADER-STRING is the header that will be inserted into the LaTeX file.
+It should contain the \\documentclass macro, and anything else that is needed
+for this setup.  To this header, the following commands will be added:
+
+- Calls to \\usepackage for all packages mentioned in the variables
+  `org-export-latex-default-packages-alist' and
+  `org-export-latex-packages-alist'.  Thus, your header definitions should
+  avoid to also request these packages.
+
+- Lines specified via \"#+LaTeX_HEADER:\"
+
+If you need more control about the sequence in which the header is built
+up, or if you want to exclude one of these building blocks for a particular
+class, you can use the following macro-like placeholders.
+
+ [DEFAULT-PACKAGES]      \\usepackage statements for default packages
+ [NO-DEFAULT-PACKAGES]   do not include any of the default packages
+ [PACKAGES]              \\usepackage statements for packages 
+ [NO-PACKAGES]           do not include the packages
+ [EXTRA]                 the stuff from #+LaTeX_HEADER
+ [NO-EXTRA]              do not include #+LaTeX_HEADER stuff
+
+So a header like
+
+  \\documentclass{article}
+  [NO-DEFAULT-PACKAGES]
+  [EXTRA]
+  \\providecommand{\\alert}[1]{\\textbf{#1}}
+  [PACKAGES]
+
+will omit the default packages, and will include the #+LaTeX_HEADER lines,
+then have a call to \\providecommand, and then place \\usepackage commands
+based on the content of `org-export-latex-packages-alist'.
+
+If your header or `org-export-latex-default-packages-alist' inserts
+\"\\usepackage[AUTO]{inputenc}\", AUTO will automatically be replaced with
+a coding system derived from `buffer-file-coding-system'.  See also the
+variable `org-export-latex-inputenc-alist' for a way to influence this
+mechanism.
+
+The sectioning structure
+------------------------
+
+The sectioning structure of the class is given by the elements following
+the header string.  For each sectioning level, a number of strings is
+specified.  A %s formatter is mandatory in each section string and will
+be replaced by the title of the section.
 
 Instead of a cons cell (numbered . unnumbered), you can also provide a list
-of 2-4 elements,
+of 2 or 4 elements,
 
   (numbered-open numbered-close)
 
@@ -157,9 +184,15 @@ or
 
   (numbered-open numbered-close unnumbered-open unnumbered-close)
 
-providing opening and closing strings for an environment that should
+providing opening and closing strings for a LaTeX environment that should
 represent the document section.  The opening clause should have a %s
-to represent the section title."
+to represent the section title.
+
+Instead of a list of sectioning commands, you can also specify a
+function name.  That function will be called with two parameters,
+the (reduced) level of the headline, and the headline text.  The function
+must return a cons cell with the (possibly modified) headline text, and the
+sectioning list in the cdr."
   :group 'org-export-latex
   :type '(repeat
 	  (list (string :tag "LaTeX class")
@@ -167,13 +200,29 @@ to represent the section title."
 		(repeat :tag "Levels" :inline t
 			(choice
 			 (cons :tag "Heading"
-			       (string :tag "numbered")
-			       (string :tag "unnumbered)"))
+			       (string :tag "  numbered")
+			       (string :tag "unnumbered"))
 			 (list :tag "Environment"
-			       (string :tag "Opening (numbered)  ")
-			       (string :tag "Closing (numbered)  ")
+			       (string :tag "Opening   (numbered)")
+			       (string :tag "Closing   (numbered)")
 			       (string :tag "Opening (unnumbered)")
-			       (string :tag "Closing (unnumbered)")))))))
+			       (string :tag "Closing (unnumbered)"))
+			 (function :tag "Hook computing sectioning"))))))
+
+(defcustom org-export-latex-inputenc-alist nil
+  "Alist of inputenc coding system names, and what should really be used.
+For example, adding an entry
+
+      (\"utf8\" . \"utf8x\")
+
+will cause \\usepackage[utf8x]{inputenc} to be used for buffers that
+are written as utf8 files."
+  :group 'org-export-latex
+  :type '(repeat
+	  (cons
+	   (string :tag "Derived from buffer")
+	   (string :tag "Use this instead"))))
+
 
 (defcustom org-export-latex-emphasis-alist
   '(("*" "\\textbf{%s}" nil)
@@ -240,6 +289,13 @@ markup defined, the first one in the association list will be used."
   :group 'org-export-latex
   :type 'string)
 
+(defcustom org-export-latex-hyperref-format "\\href{%s}{%s}"
+  "A printf format string to be applied to hyperref links.
+The format must contain two %s instances.  The first will be filled with
+the link, the second with the link description."
+  :group 'org-export-latex
+  :type 'string)
+
 (defcustom org-export-latex-tables-verbatim nil
   "When non-nil, tables are exported verbatim."
   :group 'org-export-latex
@@ -305,7 +361,7 @@ Defaults to \\begin{verbatim} and \\end{verbatim}."
 	       (string :tag "Close")))
 
 (defcustom org-export-latex-listings nil
-  "Non-nil means, export source code using the listings package.
+  "Non-nil means export source code using the listings package.
 This package will fontify source code, possibly even with color.
 If you want to use this, you also need to make LaTeX use the
 listings package, and if you want to have color, the color
@@ -376,7 +432,7 @@ allowed.  The default we use here encompasses both."
 
 (defgroup org-export-pdf nil
   "Options for exporting Org-mode files to PDF, via LaTeX."
-  :tag "Org Export LaTeX"
+  :tag "Org Export PDF"
   :group 'org-export-latex
   :group 'org-export)
 
@@ -395,25 +451,39 @@ result, and it also does not do any error checking.
 Alternatively, this may be a Lisp function that does the processing, so you
 could use this to apply the machinery of AUCTeX or the Emacs LaTeX mode.
 This function should accept the file name as its single argument."
-  :group 'org-export-latex
+  :group 'org-export-pdf
   :type '(choice (repeat :tag "Shell command sequence"
 		  (string :tag "Shell command"))
 		 (function)))
 
+(defcustom org-export-pdf-logfiles
+  '("aux" "idx" "log" "out" "toc" "nav" "snm" "vrb")
+  "The list of file extensions to consider as LaTeX logfiles."
+  :group 'org-export-pdf
+  :type '(repeat (string :tag "Extension")))
+
 (defcustom org-export-pdf-remove-logfiles t
-  "Non-nil means, remove the logfiles produced by PDF production.
+  "Non-nil means remove the logfiles produced by PDF production.
 These are the .aux, .log, .out, and .toc files."
   :group 'org-export-pdf
   :type 'boolean)
 
 ;;; Hooks
 
+(defvar org-export-latex-after-initial-vars-hook nil
+  "Hook run before LaTeX export.
+The exact moment is after the initial variables like org-export-latex-class
+have been determined from the environment.")
+
 (defvar org-export-latex-after-blockquotes-hook nil
   "Hook run during LaTeX export, after blockquote, verse, center are done.")
 
 (defvar org-export-latex-final-hook nil
   "Hook run in the finalized LaTeX buffer.")
 
+(defvar org-export-latex-after-save-hook nil
+  "Hook run in the finalized LaTeX buffer, after it has been saved.")
+
 ;;; Autoload functions:
 
 ;;;###autoload
@@ -514,6 +584,8 @@ simply return the content of \begin{document}...\end{document},
 without even the \begin{document} and \end{document} commands.
 when PUB-DIR is set, use this as the publishing directory."
   (interactive "P")
+  (run-hooks 'org-export-first-hook)
+
   ;; Make sure we have a file name when we need it.
   (when (and (not (or to-buffer body-only))
 	     (not buffer-file-name))
@@ -525,10 +597,14 @@ when PUB-DIR is set, use this as the publishing directory."
 
   (message "Exporting to LaTeX...")
   (org-unmodified
-   (remove-text-properties (point-min) (point-max)
-			   '(:org-license-to-kill nil)))
+   (let ((inhibit-read-only t))
+     (remove-text-properties (point-min) (point-max)
+			     '(:org-license-to-kill nil))))
   (org-update-radio-target-regexp)
   (org-export-latex-set-initial-vars ext-plist arg)
+  (setq org-export-opt-plist org-export-latex-options-plist)
+  (org-install-letbind)
+  (run-hooks 'org-export-latex-after-initial-vars-hook)
   (let* ((wcf (current-window-configuration))
 	 (opt-plist org-export-latex-options-plist)
 	 (region-p (org-region-active-p))
@@ -547,27 +623,40 @@ when PUB-DIR is set, use this as the publishing directory."
 			      (org-export-add-subtree-options opt-plist rbeg)
 			    opt-plist)))
 	 ;; Make sure the variable contains the updated values.
-	 (org-export-latex-options-plist opt-plist)
+	 (org-export-latex-options-plist (setq org-export-opt-plist opt-plist))
+	 ;; The following two are dynamically scoped into other
+	 ;; routines below.
+	 (org-current-export-dir
+	  (or pub-dir (org-export-directory :html opt-plist)))
+	 (org-current-export-file buffer-file-name)
 	 (title (or (and subtree-p (org-export-get-title-from-subtree))
 		    (plist-get opt-plist :title)
 		    (and (not
 			  (plist-get opt-plist :skip-before-1st-heading))
 			 (org-export-grab-title-from-buffer))
-		    (file-name-sans-extension
-		     (file-name-nondirectory buffer-file-name))))
-	 (filename (concat (file-name-as-directory
-			    (or pub-dir
-				(org-export-directory :LaTeX ext-plist)))
-			   (file-name-sans-extension
-			    (or (and subtree-p
-				     (org-entry-get rbeg "EXPORT_FILE_NAME" t))
-				(file-name-nondirectory ;sans-extension
-				 buffer-file-name)))
-			   ".tex"))
-	 (filename (if (equal (file-truename filename)
-			      (file-truename buffer-file-name))
-		       (concat filename ".tex")
-		     filename))
+		    (and buffer-file-name
+			 (file-name-sans-extension
+			  (file-name-nondirectory buffer-file-name)))
+		    "No Title"))
+	 (filename
+	  (and (not to-buffer)
+	       (concat
+		(file-name-as-directory
+		 (or pub-dir
+		     (org-export-directory :LaTeX ext-plist)))
+		(file-name-sans-extension
+		 (or (and subtree-p
+			  (org-entry-get rbeg "EXPORT_FILE_NAME" t))
+		     (file-name-nondirectory ;sans-extension
+		      (or buffer-file-name
+			  (error "Don't know which export file to use.")))))
+		".tex")))
+	 (filename
+	  (and filename
+	       (if (equal (file-truename filename)
+			  (file-truename (or buffer-file-name "dummy.org")))
+		   (concat filename ".tex")
+		 filename)))
 	 (buffer (if to-buffer
 		     (cond
 		      ((eq to-buffer 'string) (get-buffer-create
@@ -602,6 +691,24 @@ when PUB-DIR is set, use this as the publishing directory."
 	 (region (buffer-substring
 		  (if region-p (region-beginning) (point-min))
 		  (if region-p (region-end) (point-max))))
+	 (text
+	  (and text (string-match "\\S-" text)
+	       (org-export-preprocess-string
+		text
+		:emph-multiline t
+		:for-LaTeX t
+		:comments nil
+		:tags (plist-get opt-plist :tags)
+		:priority (plist-get opt-plist :priority)
+		:footnotes (plist-get opt-plist :footnotes)
+		:drawers (plist-get opt-plist :drawers)
+		:timestamps (plist-get opt-plist :timestamps)
+		:todo-keywords (plist-get opt-plist :todo-keywords)
+		:add-text nil
+		:skip-before-1st-heading skip
+		:select-tags nil
+		:exclude-tags nil
+		:LaTeX-fragments nil)))
 	 (string-for-export
 	  (org-export-preprocess-string
 	   region
@@ -656,6 +763,11 @@ when PUB-DIR is set, use this as the publishing directory."
     ;; finalization
     (unless body-only (insert "\n\\end{document}"))
 
+    ;; Attach description terms to the \item macro
+    (goto-char (point-min))
+    (while (re-search-forward "^[ \t]*\\\\item\\([ \t]+\\)\\[" nil t)
+      (delete-region (match-beginning 1) (match-end 1)))
+
     ;; Relocate the table of contents
     (goto-char (point-min))
     (when (re-search-forward "\\[TABLE-OF-CONTENTS\\]" nil t)
@@ -666,8 +778,23 @@ when PUB-DIR is set, use this as the publishing directory."
       (and (re-search-forward "\\[TABLE-OF-CONTENTS\\]" nil t)
 	   (replace-match "\\tableofcontents" t t)))
 
+    ;; Cleanup forced line ends in items where they are not needed
+    (goto-char (point-min))
+    (while (re-search-forward
+	    "^[ \t]*\\\\item\\>.*\\(\\\\\\\\\\)[ \t]*\\(\n\\\\label.*\\)*\n\\\\begin"
+	    nil t)
+      (delete-region (match-beginning 1) (match-end 1)))
+    (goto-char (point-min))
+    (while (re-search-forward
+	    "^[ \t]*\\\\item\\>.*\\(\\\\\\\\\\)[ \t]*\\(\n\\\\label.*\\)*"
+	    nil t)
+      (if (looking-at "[\n \t]+")
+	  (replace-match "\n")))
+
     (run-hooks 'org-export-latex-final-hook)
     (or to-buffer (save-buffer))
+    (org-export-latex-fix-inputenc)
+    (run-hooks 'org-export-latex-after-save-hook)
     (goto-char (point-min))
     (or (org-export-push-to-kill-ring "LaTeX")
 	(message "Exporting to LaTeX...done"))
@@ -698,7 +825,6 @@ when PUB-DIR is set, use this as the publishing directory."
 		       (re-search-forward "\\\\bibliography{" nil t))))
 	 cmd)
     (with-current-buffer outbuf (erase-buffer))
-    (and (file-exists-p pdffile) (delete-file pdffile))
     (message "Processing LaTeX file...")
     (if (and cmds (symbolp cmds))
 	(funcall cmds file)
@@ -720,7 +846,7 @@ when PUB-DIR is set, use this as the publishing directory."
 	(error "PDF file was not produced")
       (set-window-configuration wconfig)
       (when org-export-pdf-remove-logfiles
-	(dolist (ext '("aux" "log" "out" "toc"))
+	(dolist (ext org-export-pdf-logfiles)
 	  (setq file (concat base "." ext))
 	  (and (file-exists-p file) (delete-file file))))
       (message "Exporting to PDF...done")
@@ -732,7 +858,12 @@ when PUB-DIR is set, use this as the publishing directory."
   (interactive "P")
   (let ((pdffile (org-export-as-pdf arg)))
     (if pdffile
-	(org-open-file pdffile)
+	(progn
+	  (org-open-file pdffile)
+	  (when org-export-kill-product-buffer-when-displayed
+	    (kill-buffer (find-buffer-visiting
+			  (concat (file-name-sans-extension (buffer-file-name))
+				  ".tex")))))
       (error "PDF file was not produced"))))
 
 ;;; Parsing functions:
@@ -745,7 +876,7 @@ Return a list reflecting the document structure."
     (goto-char (point-min))
     (let* ((cnt 0) output
 	   (depth org-export-latex-sectioning-depth))
-      (while (re-search-forward
+      (while (org-re-search-forward-unprotected
 	      (concat "^\\(\\(?:\\*\\)\\{"
 		      (number-to-string (+ (if odd 2 1) level))
 		      "\\}\\) \\(.*\\)$")
@@ -753,7 +884,7 @@ Return a list reflecting the document structure."
 	      (when (> level 0)
 		(save-excursion
 		  (save-match-data
-		    (re-search-forward
+		    (org-re-search-forward-unprotected
 		     (concat "^\\(\\(?:\\*\\)\\{"
 			     (number-to-string level)
 			     "\\}\\) \\(.*\\)$") nil t)))) t)
@@ -765,7 +896,7 @@ Return a list reflecting the document structure."
 	    (narrow-to-region
 	     (point)
 	     (save-match-data
-	       (if (re-search-forward
+	       (if (org-re-search-forward-unprotected
 		    (concat "^\\(\\(?:\\*\\)\\{"
 			    (number-to-string (+ (if odd 2 1) level))
 			    "\\}\\) \\(.*\\)$") nil t)
@@ -789,7 +920,7 @@ Return a list reflecting the document structure."
 (defun org-export-latex-parse-content ()
   "Extract the content of a section."
   (let ((beg (point))
-	(end (if (re-search-forward "^\\(\\*\\)+ .*$" nil t)
+	(end (if (org-re-search-forward-unprotected "^\\(\\*\\)+ .*$" nil t)
 		 (progn (beginning-of-line) (point))
 	       (point-max))))
     (buffer-substring beg end)))
@@ -797,7 +928,7 @@ Return a list reflecting the document structure."
 (defun org-export-latex-parse-subcontent (level odd)
   "Extract the subcontent of a section at LEVEL.
 If ODD Is non-nil, assume subcontent only contains odd sections."
-  (if (not (re-search-forward
+  (if (not (org-re-search-forward-unprotected
 	    (concat "^\\(\\(?:\\*\\)\\{"
 		    (number-to-string (+ (if odd 4 2) level))
 		    "\\}\\) \\(.*\\)$")
@@ -824,8 +955,7 @@ and its content."
 (defun org-export-latex-subcontent (subcontent num)
   "Export each cell of SUBCONTENT to LaTeX.
 If NUM, export sections as numerical sections."
-  (let* ((heading (org-export-latex-fontify-headline
-		   (cdr (assoc 'heading subcontent))))
+  (let* ((heading (cdr (assoc 'heading subcontent)))
 	 (level (- (cdr (assoc 'level subcontent))
 		   org-export-latex-add-level))
 	 (occur (number-to-string (cdr (assoc 'occur subcontent))))
@@ -833,32 +963,61 @@ If NUM, export sections as numerical sections."
 	 (subcontent (cadr (assoc 'subcontent subcontent)))
 	 (label (org-get-text-property-any 0 'target heading))
 	 (label-list (cons label (cdr (assoc label
-					     org-export-target-aliases)))))
+					     org-export-target-aliases))))
+	 (sectioning org-export-latex-sectioning)
+	 (depth org-export-latex-sectioning-depth)
+	 main-heading sub-heading)
+    (when (symbolp (car sectioning))
+      (setq sectioning (funcall (car sectioning) level heading))
+      (when sectioning
+	(setq heading (car sectioning)
+	      sectioning (cdr sectioning)
+	      ;; target property migh have changed...
+	      label (org-get-text-property-any 0 'target heading)
+	      label-list (cons label (cdr (assoc label
+						 org-export-target-aliases)))))
+      (if sectioning (setq sectioning (make-list 10 sectioning)))
+      (setq depth (if sectioning 10000 0)))
+    (if (string-match "[ \t]*\\\\\\\\[ \t]*" heading)
+	(setq main-heading (substring heading 0 (match-beginning 0))
+	      sub-heading (substring heading (match-end 0))))
+    (setq heading (org-export-latex-fontify-headline heading)
+	  sub-heading (and sub-heading
+			   (org-export-latex-fontify-headline sub-heading))
+	  main-heading (and main-heading
+			    (org-export-latex-fontify-headline main-heading)))
     (cond
      ;; Normal conversion
-     ((<= level org-export-latex-sectioning-depth)
-      (let* ((sec (nth (1- level) org-export-latex-sectioning))
+     ((<= level depth)
+      (let* ((sec (nth (1- level) sectioning))
 	     start end)
 	(if (consp (cdr sec))
 	    (setq start (nth (if num 0 2) sec)
 		  end (nth (if num 1 3) sec))
 	  (setq start (if num (car sec) (cdr sec))))
-	(insert (format start heading) "\n")
+	(insert (format start (if main-heading main-heading heading)
+			(or sub-heading "")))
+	(insert	"\n")
 	(when label
 	  (insert (mapconcat (lambda (l) (format "\\label{%s}" l))
 			     label-list "\n") "\n"))
 	(insert (org-export-latex-content content))
 	(cond ((stringp subcontent) (insert subcontent))
-	      ((listp subcontent) (org-export-latex-sub subcontent)))
-	(if end (insert end "\n"))))
+	      ((listp subcontent)
+	       (while (org-looking-back "\n\n") (backward-delete-char 1))
+	       (org-export-latex-sub subcontent)))
+	(when (and end (string-match "[^ \t]" end))
+	  (let ((hook (org-get-text-property-any 0 'org-insert-hook end)))
+	    (and (functionp hook) (funcall hook)))
+	  (insert end "\n"))))
      ;; At a level under the hl option: we can drop this subsection
-     ((> level org-export-latex-sectioning-depth)
+     ((> level depth)
       (cond ((eq org-export-latex-low-levels 'description)
 	     (if (string-match "% ends low level$"
 			       (buffer-substring (point-at-bol 0) (point)))
 		 (delete-region (point-at-bol 0) (point))
 	       (insert "\\begin{description}\n"))
-	     (insert (format "\n\\item[%s]%s~\n\n"
+	     (insert (format "\n\\item[%s]%s~\n"
 			     heading
 			     (if label (format "\\label{%s}" label) "")))
 	     (insert (org-export-latex-content content))
@@ -871,7 +1030,7 @@ If NUM, export sections as numerical sections."
 		 (delete-region (point-at-bol 0) (point))
 	       (insert (format "\\begin{%s}\n"
 			       (symbol-name org-export-latex-low-levels))))
-	     (insert (format "\n\\item %s\\\\\n%s\n"
+	     (insert (format "\n\\item %s\\\\\n%s%%"
 			     heading
 			     (if label (format "\\label{%s}" label) "")))
 	     (insert (org-export-latex-content content))
@@ -930,6 +1089,19 @@ LEVEL indicates the default depth for export."
 		     (match-string 1))))
 	    (plist-get org-export-latex-options-plist :latex-class)
 	    org-export-latex-default-class)
+	org-export-latex-class-options
+	(or (and (org-region-active-p)
+		 (save-excursion
+		   (goto-char (region-beginning))
+		   (and (looking-at org-complex-heading-regexp)
+			(org-entry-get nil "LaTeX_CLASS_OPTIONS" 'selective))))
+	    (save-excursion
+	      (save-restriction
+		(widen)
+		(goto-char (point-min))
+		(and (re-search-forward "^#\\+LaTeX_CLASS_OPTIONS:[ \t]*\\(.*?\\)[ \t]*$" nil t)
+		     (match-string 1))))
+	    (plist-get org-export-latex-options-plist :latex-class-options))
 	org-export-latex-class
 	(or (car (assoc org-export-latex-class org-export-latex-classes))
 	    (error "No definition for class `%s' in `org-export-latex-classes'"
@@ -943,32 +1115,42 @@ LEVEL indicates the default depth for export."
 	    (let ((hl-levels
 		   (plist-get org-export-latex-options-plist :headline-levels))
 		  (sec-depth (length org-export-latex-sectioning)))
-	      (if (> hl-levels sec-depth) sec-depth hl-levels)))))
+	      (if (> hl-levels sec-depth) sec-depth hl-levels))))
+  (when (and org-export-latex-class-options
+	     (string-match "\\S-" org-export-latex-class-options)
+	     (string-match "^[ \t]*\\(\\\\documentclass\\)\\(\\[.*?\\]\\)?"
+			   org-export-latex-header))
+    (setq org-export-latex-header
+	  (concat (substring org-export-latex-header 0 (match-end 1))
+		  org-export-latex-class-options
+		  (substring org-export-latex-header (match-end 0))))))
+
+(defvar org-export-latex-format-toc-function
+  'org-export-latex-format-toc-default
+  "The function formatting returning the string to createthe table of contents.
+The function mus take one parameter, the depth of the table of contents.")
 
 (defun org-export-latex-make-header (title opt-plist)
   "Make the LaTeX header and return it as a string.
 TITLE is the current title from the buffer or region.
 OPT-PLIST is the options plist for current buffer."
   (let ((toc (plist-get opt-plist :table-of-contents))
-	(author (plist-get opt-plist :author)))
+	(author (org-export-apply-macros-in-string
+		 (plist-get opt-plist :author))))
     (concat
      (if (plist-get opt-plist :time-stamp-file)
 	 (format-time-string "%% Created %Y-%m-%d %a %H:%M\n"))
-     ;; insert LaTeX custom header
-     (org-export-apply-macros-in-string org-export-latex-header)
-     "\n"
-     ;; insert information on LaTeX packages
-     (when org-export-latex-packages-alist
-       (mapconcat (lambda(p)
-		    (if (equal "" (car p))
-			(format "\\usepackage{%s}" (cadr p))
-		      (format "\\usepackage[%s]{%s}"
-			      (car p) (cadr p))))
-		  org-export-latex-packages-alist "\n"))
-     ;; insert additional commands in the header
-     (org-export-apply-macros-in-string
-      (plist-get opt-plist :latex-header-extra))
+     ;; insert LaTeX custom header and packages from the list
+     (org-splice-latex-header
+      (org-export-apply-macros-in-string org-export-latex-header)
+      org-export-latex-default-packages-alist
+      org-export-latex-packages-alist
+      (org-export-apply-macros-in-string
+       (plist-get opt-plist :latex-header-extra)))
+     ;; append another special variable
      (org-export-apply-macros-in-string org-export-latex-append-header)
+     ;; define align if not yet defined
+     "\n\\providecommand{\\alert}[1]{\\textbf{#1}}"
      ;; insert the title
      (format
       "\n\n\\title{%s}\n"
@@ -980,7 +1162,7 @@ OPT-PLIST is the options plist for current buffer."
 	 (format "\\author{%s}\n"
 		 (org-export-latex-fontify-headline (or author user-full-name)))
        (format "%%\\author{%s}\n"
-	       (or author user-full-name)))
+	       (org-export-latex-fontify-headline (or author user-full-name))))
      ;; insert the date
      (format "\\date{%s}\n"
 	     (format-time-string
@@ -997,13 +1179,15 @@ OPT-PLIST is the options plist for current buffer."
      ;; table of contents
      (when (and org-export-with-toc
 		(plist-get opt-plist :section-numbers))
-       (cond ((numberp toc)
-	      (format "\\setcounter{tocdepth}{%s}\n\\tableofcontents\n\\vspace*{1cm}\n"
-		      (min toc (plist-get opt-plist :headline-levels))))
-	     (toc (format "\\setcounter{tocdepth}{%s}\n\\tableofcontents\n\\vspace*{1cm}\n"
-			  (plist-get opt-plist :headline-levels)))))
-     (when (plist-get opt-plist :preserve-breaks)
-       "\\obeylines\n"))))
+       (funcall org-export-latex-format-toc-function
+		(cond ((numberp toc)
+		       (min toc (plist-get opt-plist :headline-levels)))
+		      (toc  (plist-get opt-plist :headline-levels))))))))
+
+(defun org-export-latex-format-toc-default (depth)
+  (when depth
+    (format "\\setcounter{tocdepth}{%s}\n\\tableofcontents\n\\vspace*{1cm}\n"
+	    depth)))
 
 (defun org-export-latex-first-lines (opt-plist &optional beg end)
   "Export the first lines before first headline.
@@ -1028,8 +1212,9 @@ If END is non-nil, it is the end of the region."
 	    :timestamps (plist-get opt-plist :timestamps)
 	    :footnotes (plist-get opt-plist :footnotes)))
 	(org-unmodified
-	 (add-text-properties pt (max pt (1- end))
-			      '(:org-license-to-kill t)))))))
+	 (let ((inhibit-read-only t))
+	   (add-text-properties pt (max pt (1- end))
+				'(:org-license-to-kill t))))))))
 
 (defvar org-export-latex-header-defs nil
   "The header definitions that might be used in the LaTeX body.")
@@ -1127,13 +1312,20 @@ links, keywords, lists, tables, fixed-width"
     ;; the beginning of the buffer - inserting "\n" is safe here though.
     (insert "\n" string)
     (goto-char (point-min))
-    (let ((re (concat "\\\\[a-zA-Z]+\\(?:"
-		      "\\[.*\\]"
-		      "\\)?"
-		      (org-create-multibrace-regexp "{" "}" 3))))
+    (let ((re (concat "\\\\\\([a-zA-Z]+\\)"
+		      "\\(?:<[^<>\n]*>\\)*"
+		      "\\(?:\\[[^][\n]*?\\]\\)*"
+		      "\\(?:<[^<>\n]*>\\)*"
+		      "\\("
+		      (org-create-multibrace-regexp "{" "}" 3)
+		      "\\)\\{1,3\\}")))
       (while (re-search-forward re nil t)
-	(unless (save-excursion (goto-char (match-beginning 0))
-				(equal (char-after (point-at-bol)) ?#))
+	(unless (or
+		 ;; check for comment line
+		 (save-excursion (goto-char (match-beginning 0))
+				 (equal (char-after (point-at-bol)) ?#))
+		 ;; Check if this is a defined entity, so that is may need conversion
+		 (org-entity-get (match-string 1)))
 	  (add-text-properties (match-beginning 0) (match-end 0)
 			       '(org-protected t)))))
     (when (plist-get org-export-latex-options-plist :emphasize)
@@ -1192,7 +1384,8 @@ See the `org-export-latex.el' code for a complete conversion table."
 		     (if (equal (match-string 1) "\\")
 			 (replace-match (match-string 2) t t)
 		       (replace-match (concat (match-string 1) "\\"
-					      (match-string 2)) t t)))
+					      (match-string 2)) t t)
+		       (backward-char 1)))
 		    ((equal (match-string 2) "...")
 		     (replace-match
 		      (concat (match-string 1)
@@ -1216,7 +1409,19 @@ See the `org-export-latex.el' code for a complete conversion table."
 					    (org-export-latex-treat-backslash-char
 					     (match-string 1)
 					     (or (match-string 3) "")))
-					  "") t t))
+					  "") t t)
+		       (when (and (get-text-property (1- (point)) 'org-entity)
+				  (looking-at "{}"))
+			 ;; OK, this was an entity replacement, and the user
+			 ;; had terminated the entity with {}.  Make sure
+			 ;; {} is protected as well, and remove the extra {}
+			 ;; inserted by the conversion.
+			 (put-text-property (point) (+ 2 (point)) 'org-protected t)
+			 (if (save-excursion (goto-char (max (- (point) 2) (point-min)))
+					     (looking-at "{}"))
+			     (replace-match ""))
+			 (forward-char 2))
+		       (backward-char 1))
 		      ((member (match-string 2) '("_" "^"))
 		       (replace-match (or (save-match-data
 					    (org-export-latex-treat-sub-super-char
@@ -1227,8 +1432,8 @@ See the `org-export-latex.el' code for a complete conversion table."
 		       (backward-char 1)))))))
 	'(;"^\\([^\n$]*?\\|^\\)\\(\\\\?\\$\\)\\([^\n$]*\\)$"
 	  "\\(\\(\\\\?\\$\\)\\)"
-	  "\\([a-za-z0-9]+\\|[ \t\n]\\|\\b\\|\\\\\\)\\(_\\|\\^\\)\\({[^{}]+}\\|[a-za-z0-9]+\\|[ \t\n]\\|[:punct:]\\|)\\|{[a-za-z0-9]+}\\|([a-za-z0-9]+)\\)"
-	  "\\(.\\|^\\)\\(\\\\\\)\\([ \t\n]\\|[a-zA-Z&#%{}\"]+\\)"
+	  "\\([a-zA-Z0-9()]+\\|[ \t\n]\\|\\b\\|\\\\\\)\\(_\\|\\^\\)\\({[^{}]+}\\|[a-zA-Z0-9]+\\|[ \t\n]\\|[:punct:]\\|)\\|{[a-zA-Z0-9]+}\\|([a-zA-Z0-9]+)\\)"
+	  "\\(.\\|^\\)\\(\\\\\\)\\([ \t\n]\\|\\([&#%{}\"]\\|[a-zA-Z][a-zA-Z0-9]*\\)\\)"
 	  "\\(.\\|^\\)\\(&\\)"
 	  "\\(.\\|^\\)\\(#\\)"
 	  "\\(.\\|^\\)\\(%\\)"
@@ -1280,29 +1485,35 @@ Convert CHAR depending on STRING-BEFORE and STRING-AFTER."
 (defun org-export-latex-treat-backslash-char (string-before string-after)
   "Convert the \"$\" special character to LaTeX.
 The conversion is made depending of STRING-BEFORE and STRING-AFTER."
-  (cond ((member (list string-after) org-html-entities)
-	 ;; backslash is part of a special entity (like "\alpha")
-	 (concat string-before "$\\"
-		 (or (cdar (member (list string-after) org-html-entities))
-		     string-after) "$"))
-	((and (not (string-match "^[ \n\t]" string-after))
-	      (not (string-match "[ \t]\\'\\|^" string-before)))
-	 ;; backslash is inside a word
-	 (org-export-latex-protect-string
-	  (concat string-before "\\textbackslash{}" string-after)))
-	((not (or (equal string-after "")
-		  (string-match "^[ \t\n]" string-after)))
-	 ;; backslash might escape a character (like \#) or a user TeX
-	 ;; macro (like \setcounter)
-	 (org-export-latex-protect-string
-	  (concat string-before "\\" string-after)))
-	((and (string-match "^[ \t\n]" string-after)
-	      (string-match "[ \t\n]\\'" string-before))
-	 ;; backslash is alone, convert it to $\backslash$
-	 (org-export-latex-protect-string
-	  (concat string-before "\\textbackslash{}" string-after)))
-	(t (org-export-latex-protect-string
-	    (concat string-before "\\textbackslash{}" string-after)))))
+  (let  ((ass (org-entity-get string-after)))
+    (cond
+     (ass (org-add-props
+	      (if (nth 2 ass)
+		  (concat string-before
+			  (org-export-latex-protect-string
+			   (concat "$" (nth 1 ass) "$")))
+		(concat string-before (org-export-latex-protect-string
+				       (nth 1 ass))))
+	      nil 'org-entity t))
+     ((and (not (string-match "^[ \n\t]" string-after))
+	   (not (string-match "[ \t]\\'\\|^" string-before)))
+      ;; backslash is inside a word
+      (concat string-before
+	      (org-export-latex-protect-string
+	       (concat "\\textbackslash{}" string-after))))
+     ((not (or (equal string-after "")
+	       (string-match "^[ \t\n]" string-after)))
+      ;; backslash might escape a character (like \#) or a user TeX
+      ;; macro (like \setcounter)
+      (concat string-before
+	      (org-export-latex-protect-string (concat "\\" string-after))))
+     ((and (string-match "^[ \t\n]" string-after)
+	   (string-match "[ \t\n]\\'" string-before))
+      ;; backslash is alone, convert it to $\backslash$
+      (org-export-latex-protect-string
+       (concat string-before "\\textbackslash{}" string-after)))
+     (t (org-export-latex-protect-string
+	 (concat string-before "\\textbackslash{}" string-after))))))
 
 (defun org-export-latex-keywords ()
   "Convert special keywords to LaTeX."
@@ -1312,9 +1523,9 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 			   (match-string 0)) t t)
     (save-excursion
       (beginning-of-line 1)
-      (unless (looking-at ".*\\\\newline[ \t]*$")
+      (unless (looking-at ".*\n[ \t]*\n")
 	(end-of-line 1)
-	(insert "\\newline")))))
+	(insert "\n")))))
 
 (defun org-export-latex-fixed-width (opt)
   "When OPT is non-nil convert fixed-width sections to LaTeX."
@@ -1340,6 +1551,14 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (declare-function orgtbl-to-latex "org-table" (table params) t)
 (defun org-export-latex-tables (insert)
   "Convert tables to LaTeX and INSERT it."
+  ;; First, get the table.el tables
+  (goto-char (point-min))
+  (while (re-search-forward "^[ \t]*\\(\\+-[-+]*\\+\\)[ \t]*\n[ \t]*|" nil t)
+    (org-if-unprotected
+     (require 'table)
+     (org-export-latex-convert-table.el-table)))
+
+  ;; And now the Org-mode tables
   (goto-char (point-min))
   (while (re-search-forward "^\\([ \t]*\\)|" nil t)
     (org-if-unprotected-at (1- (point))
@@ -1370,6 +1589,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                              (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr)
                              (match-string 1 attr))
                   floatp (or caption label))
+	    (setq caption (and caption (org-export-latex-fontify-headline caption)))
             (setq lines (org-split-string raw-table "\n"))
             (apply 'delete-region (list beg end))
             (when org-export-table-remove-special-lines
@@ -1424,12 +1644,12 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                         (if longtblp
                             (concat "\\begin{longtable}{" align "}\n")
                           (if floatp "\\begin{table}[htb]\n"))
-                        (if (or floatp longtblp)
+                        (if floatp
                             (format
                              "\\caption{%s%s}"
                              (if label (concat "\\\label{" label "}") "")
                              (or caption "")))
-                        (if longtblp "\\\\\n" "\n")
+                        (if (and longtblp caption) "\\\\\n" "\n")
                         (if (and org-export-latex-tables-centered (not longtblp))
                             "\\begin{center}\n")
                         (if (not longtblp) (concat "\\begin{tabular}{" align "}\n"))
@@ -1452,6 +1672,56 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                           (if floatp "\\end{table}"))))
                       "\n\n"))))))))
 
+(defun org-export-latex-convert-table.el-table ()
+  "Replace table.el table at point with LaTeX code."
+  (let (tbl caption label line floatp attr align rmlines)
+    (setq line (buffer-substring (point-at-bol) (point-at-eol))
+	  label (org-get-text-property-any 0 'org-label line)
+	  caption (org-get-text-property-any 0 'org-caption line)
+	  attr (org-get-text-property-any 0 'org-attributes line)
+	  align (and attr (stringp attr)
+		     (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr)
+		     (match-string 1 attr))
+	  rmlines (and attr (stringp attr)
+		       (string-match "\\<rmlines\\>" attr))
+	  floatp (or label caption))
+    (and (get-buffer "*org-export-table*")
+	 (kill-buffer (get-buffer "*org-export-table*")))
+    (table-generate-source 'latex "*org-export-table*" "caption")
+    (setq tbl (with-current-buffer "*org-export-table*"
+		(buffer-string)))
+    (while (string-match "^%.*\n" tbl)
+      (setq tbl (replace-match "" t t tbl)))
+    ;; fix the hlines
+    (when rmlines
+      (let ((n 0) lines)
+	(setq lines (mapcar (lambda (x)
+			      (if (string-match "^\\\\hline$" x)
+				  (progn
+				    (setq n (1+ n))
+				    (if (= n 2) x nil))
+				x))
+			    (org-split-string tbl "\n")))
+	(setq tbl (mapconcat 'identity (delq nil lines) "\n"))))
+    (when (and align (string-match "\\\\begin{tabular}{.*}" tbl))
+      (setq tbl (replace-match (concat "\\begin{tabular}{" align "}")
+			       t t tbl)))
+    (and (get-buffer "*org-export-table*")
+	 (kill-buffer (get-buffer "*org-export-table*")))
+    (beginning-of-line 0)
+    (while (looking-at "[ \t]*\\(|\\|\\+-\\)")
+      (delete-region (point) (1+ (point-at-eol))))
+    (when org-export-latex-tables-centered
+      (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}")))
+    (when floatp
+      (setq tbl (concat "\\begin{table}\n"
+			(format "\\caption{%s%s}\n"
+				(if label (format "\\label{%s}" label) "")
+				(or caption ""))
+			tbl
+			"\n\\end{table}\n")))
+    (insert (org-export-latex-protect-string tbl))))
+
 (defun org-export-latex-fontify ()
   "Convert fontification to LaTeX."
   (goto-char (point-min))
@@ -1473,7 +1743,10 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 		    (save-match-data
 		      (and (org-at-table-p)
 			   (string-match
-			    "[|\n]" (buffer-substring beg end))))))
+			    "[|\n]" (buffer-substring beg end)))))
+		  (and (equal (match-string 3) "+")
+		       (save-match-data
+			 (string-match "\\`-+\\'" (match-string 4)))))
 	(setq s (match-string 4))
 	(setq rpl (concat (match-string 1)
 			  (org-export-latex-emph-format (cadr emph)
@@ -1482,7 +1755,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	(if (caddr emph)
 	    (setq rpl (org-export-latex-protect-string rpl))
 	  (save-match-data
-	    (if (string-match "\\`.\\(\\\\[a-z]+{\\)\\(.*\\)\\(}\\).?\\'" rpl)
+	    (if (string-match "\\`.?\\(\\\\[a-z]+{\\)\\(.*\\)\\(}\\).?\\'" rpl)
 		(progn
 		  (add-text-properties (match-beginning 1) (match-end 1)
 				       '(org-protected t) rpl)
@@ -1573,6 +1846,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 				       raw-path))))))))
        ;; process with link inserting
        (apply 'delete-region remove)
+       (setq caption (and caption (org-export-latex-fontify-headline caption)))
        (cond ((and imgp
 		   (plist-get org-export-latex-options-plist :inline-images))
 	      ;; OK, we need to inline an image
@@ -1589,27 +1863,28 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 			      (org-remove-initial-hash
 			       (org-solidify-link-text raw-path))
 			      desc)))
-	     (path 
+	     (path
 	      (when (org-at-table-p)
 		;; There is a strange problem when we have a link in a table,
 		;; ampersands then cause a problem.  I think this must be
 		;; a LaTeX issue, but we here implement a work-around anyway.
 		(setq path (org-export-latex-protect-amp path)
 		      desc (org-export-latex-protect-amp desc)))
-	      (insert (format "\\href{%s}{%s}" path desc)))
+	      (insert (format org-export-latex-hyperref-format path desc)))
 	     (t (insert "\\texttt{" desc "}")))))))
 
 
 (defun org-export-latex-format-image (path caption label attr)
   "Format the image element, depending on user settings."
-  (let (floatp wrapp placement figenv)
+  (let (ind floatp wrapp placement figenv)
     (setq floatp (or caption label))
+    (setq ind (org-get-text-property-any 0 'original-indentation path))
     (when (and attr (stringp attr))
       (if (string-match "[ \t]*\\<wrap\\>" attr)
 	  (setq wrapp t floatp nil attr (replace-match "" t t attr)))
       (if (string-match "[ \t]*\\<float\\>" attr)
 	  (setq wrapp nil floatp t attr (replace-match "" t t attr))))
-    
+
     (setq placement
 	  (cond
 	   (wrapp "{l}{0.5\\textwidth}")
@@ -1639,20 +1914,28 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 \\end{figure}")
 	   (t "\\includegraphics[%attr]{%path}")))
 
+
+    (setq figenv (mapconcat 'identity (split-string figenv "\n")
+			    (save-excursion (beginning-of-line 1)
+					    (looking-at "[ \t]*")
+					    (concat "\n" (match-string 0)))))
+
     (if (and (not label) (not caption)
 	     (string-match "^\\\\caption{.*\n" figenv))
 	(setq figenv (replace-match "" t t figenv)))
-    (org-fill-template
-     figenv
-     (list (cons "path"
-		 (if (file-name-absolute-p path)
-		     (expand-file-name path)
-		   path))
-	   (cons "attr" attr)
-	   (cons "labelcmd" (if label (format "\\label{%s}"
-					      label)""))
-	   (cons "caption" (or caption ""))
-	   (cons "placement" (or placement ""))))))
+    (org-add-props
+	(org-fill-template
+	 figenv
+	 (list (cons "path"
+		     (if (file-name-absolute-p path)
+			 (expand-file-name path)
+		       path))
+	       (cons "attr" attr)
+	       (cons "labelcmd" (if label (format "\\label{%s}"
+						  label)""))
+	       (cons "caption" (or caption ""))
+	       (cons "placement" (or placement ""))))
+	nil 'original-indentation ind)))
 
 (defun org-export-latex-protect-amp (s)
   (while (string-match "\\([^\\\\]\\)\\(&\\)" s)
@@ -1705,13 +1988,15 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	  (setq beg (+ (match-beginning 0) off) end (- (match-end 0) 0))
 	  (add-text-properties beg end '(org-protected t org-latex-math t))))))
 
-  ;; Convert LaTeX to \LaTeX{}
+  ;; Convert LaTeX to \LaTeX{} and TeX to \TeX{}
   (goto-char (point-min))
   (let ((case-fold-search nil))
-    (while (re-search-forward "\\([^+_]\\)LaTeX" nil t)
-      (org-if-unprotected
-       (replace-match (org-export-latex-protect-string
-		       (concat (match-string 1) "\\LaTeX{}")) t t))))
+    (while (re-search-forward "\\<\\(\\(La\\)?TeX\\)\\>" nil t)
+      (unless (eq (char-before (match-beginning 1)) ?\\)
+	(org-if-unprotected-1
+	 (replace-match (org-export-latex-protect-string
+			 (concat "\\" (match-string 1)
+				 "{}")) t t)))))
 
   ;; Convert blockquotes
   (goto-char (point-min))
@@ -1759,13 +2044,21 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
      (replace-match (org-export-latex-protect-string "\\hrule") t t)))
 
   ;; Protect LaTeX commands like \command[...]{...} or \command{...}
-  (let ((re (concat "\\\\[a-zA-Z]+\\(?:"
-		    "\\[.*\\]"
-		    "\\)?"
-		    (org-create-multibrace-regexp "{" "}" 3))))
+  (goto-char (point-min))
+  (let ((re (concat
+	     "\\\\\\([a-zA-Z]+\\)"
+	     "\\(?:<[^<>\n]*>\\)*"
+	     "\\(?:\\[[^][\n]*?\\]\\)*"
+	     "\\(?:<[^<>\n]*>\\)*"
+	     "\\(" (org-create-multibrace-regexp "{" "}" 3) "\\)\\{1,3\\}")))
     (while (re-search-forward re nil t)
-      (unless (save-excursion (goto-char (match-beginning 0))
-			      (equal (char-after (point-at-bol)) ?#))
+      (unless (or 
+	       ;; check for comment line
+	       (save-excursion (goto-char (match-beginning 0))
+			       (equal (char-after (point-at-bol)) ?#))
+	       ;; Check if this is a defined entity, so that is may need conversion
+	       (org-entity-get (match-string 1))
+	       )
 	(add-text-properties (match-beginning 0) (match-end 0)
 			     '(org-protected t)))))
 
@@ -1786,10 +2079,12 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 		  ">>>?\\((INVISIBLE)\\)?") nil t)
     (org-if-unprotected-at (+ (match-beginning 0) 2)
      (replace-match
-      (org-export-latex-protect-string
-       (format "\\label{%s}%s" (save-match-data (org-solidify-link-text
-						 (match-string 1)))
-	       (if (match-string 2) "" (match-string 1)))) t t)))
+      (concat
+       (org-export-latex-protect-string
+	(format "\\label{%s}" (save-match-data (org-solidify-link-text
+						(match-string 1)))))
+       (if (match-string 2) "" (match-string 1)))
+      t t)))
 
   ;; Delete @<...> constructs
   ;; Thanks to Daniel Clemente for this regexp
@@ -1832,6 +2127,10 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 		 (add-text-properties (1- (length footnote-rpl))
 				      (length footnote-rpl)
 				      '(org-protected t) footnote-rpl)
+		 (if (org-on-heading-p)
+                     (setq footnote-rpl
+                           (concat (org-export-latex-protect-string "\\protect")
+                                   footnote-rpl)))
 		 (insert footnote-rpl)))
 	     )))))
 
@@ -1842,6 +2141,24 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
       (org-if-unprotected
        (replace-match "")))))
 
+(defun org-export-latex-fix-inputenc ()
+  "Set the codingsystem in inputenc to what the buffer is."
+  (let* ((cs buffer-file-coding-system)
+	 (opt (or (ignore-errors (latexenc-coding-system-to-inputenc cs))
+		  "utf8")))
+    (when opt
+      ;; Translate if that is requested
+      (setq opt (or (cdr (assoc opt org-export-latex-inputenc-alist)) opt))
+      ;; find the \usepackage statement and replace the option
+      (goto-char (point-min))
+      (while (re-search-forward "\\\\usepackage\\[\\(AUTO\\)\\]{inputenc}"
+				nil t)
+	(goto-char (match-beginning 1))
+	(delete-region (match-beginning 1) (match-end 1))
+	(insert opt))
+      (and buffer-file-name
+	   (save-buffer)))))
+
 ;;; List handling:
 
 (defun org-export-latex-lists ()