ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2013-04-15 23:38:47 +02:00
parent 600c55a039 5e0c969381
commit 92eaf7bbd8
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
doc/org.texi
View File

@ -10410,13 +10410,14 @@ compact form with the @code{#+OPTIONS} keyword; or for a tree by setting
properties (@pxref{Properties and Columns}). Options set at a specific level
override options set at a more general level.
@cindex #+SETUPFILE
In-buffer settings may appear anywhere in the file, either directly or
indirectly through a file included using @code{#+SETUPFILE}. Option keyword
sets tailored to a particular back-end can be inserted from the export
dispatcher (@pxref{The Export Dispatcher}) using the @code{Insert template}
command by pressing @key{#}. To insert keywords individually, a good way to
make sure the keyword is correct is to type @code{#+} and then to use
@kbd{M-<TAB>} for completion.
indirectly through a file included using @samp{#+SETUPFILE: filename} syntax.
Option keyword sets tailored to a particular back-end can be inserted from
the export dispatcher (@pxref{The Export Dispatcher}) using the @code{Insert
template} command by pressing @key{#}. To insert keywords individually,
a good way to make sure the keyword is correct is to type @code{#+} and then
to use @kbd{M-<TAB>} for completion.
The export keywords available for every back-end, and their equivalent global
variables, include:
@ -10609,14 +10610,12 @@ Toggle inclusion of TODO keywords into exported text
Toggle inclusion of tables (@var{org-export-with-tables}).
@end table
@cindex #+BIND
A more general mechanism is also provided. Indeed, Emacs variables can
become buffer-local during export by using the BIND keyword. Its syntax is
@samp{#+BIND: variable value}. This is particularly useful for in-buffer
settings that cannot be changed using specific keywords.
You can place commonly-used export settings in a separate file which can be
included using @samp{#+SETUPFILE: filename} syntax.
These settings affect all buffer's export processes. Though, it is possible
to override them locally when exporting only a subtree. This is done by
adding a headline property named after the keyword with the @samp{EXPORT_}
@ -10973,8 +10972,6 @@ Export only the visible part of the document.
@vindex org-html-preamble-format
@vindex org-html-postamble-format
@vindex org-html-validation-link
@vindex org-export-author-info
@vindex org-export-email-info
@vindex org-export-creator-string
@vindex org-export-time-stamp-file
@ -11392,9 +11389,12 @@ options have to be provided, as expected by @LaTeX{}, within square brackets.
@cindex #+LATEX_HEADER
@cindex #+LATEX_HEADER_EXTRA
You can also use LATEX_HEADER and LATEX_HEADER_EXTRA keywords in order to add
lines to the header. See the docstring of @var{org-latex-classes} for more
information.
You can also use @code{LATEX_HEADER} and
@code{LATEX_HEADER_EXTRA}@footnote{Unlike to @code{LATEX_HEADER}, contents
from @code{LATEX_HEADER_EXTRA} keywords will not be loaded when previewing
@LaTeX{} snippets (@pxref{Previewing @LaTeX{} fragments}).} keywords in order
to add lines to the header. See the docstring of @var{org-latex-classes} for
more information.
An example is shown below.

4
lisp/ox-latex.el
View File

@ -327,8 +327,8 @@ macro-like placeholders.
[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
[EXTRA] the stuff from #+LATEX_HEADER(_EXTRA)
[NO-EXTRA] do not include #+LATEX_HEADER(_EXTRA) stuff
So a header like