summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-07-06 15:01:18 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-07-06 15:04:00 +0200
commit2cc4c0d564e042ba902d74d264fafdf10ee423c3 (patch)
tree6d65477d9620a0bcb809bf017b211c3d6969e4e4
parentb7157cc6661833fbd17b791458f1f6ce965328ae (diff)
downloadorg-mode-2cc4c0d564e042ba902d74d264fafdf10ee423c3.tar.gz
BEAMER: Standardize the header cookie for the beamer extra stuff
* lisp/org-beamer.el (org-beamer-amend-header): Standardize the header cookie for the beamer extra stuff.
-rw-r--r--lisp/org-beamer.el3
-rw-r--r--lisp/org-latex.el1
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el
index 1530bfc..5afc4ee 100644
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@@ -387,7 +387,8 @@ the value will be inserted right after the documentclass statement."
org-beamer-header-extra)
(goto-char (point-min))
(cond
- ((re-search-forward "^[ \t]*BEAMER-HEADER-EXTRA-HERE[ \t]*$" nil t)
+ ((re-search-forward
+ "^[ \t]*\\[?BEAMER-HEADER-EXTRA\\(-HERE\\)?\\]?[ \t]*$" nil t)
(replace-match org-beamer-header-extra t t)
(or (bolp) (insert "\n")))
((re-search-forward "^[ \t]*\\\\begin{document}" nil t)
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index e1e42e0..70298fd 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -148,6 +148,7 @@ class, you can use the following macro-like placeholders.
[NO-PACKAGES] do not include the packages
[EXTRA] the stuff from #+LaTeX_HEADER
[NO-EXTRA] do not include #+LaTeX_HEADER stuff
+ [BEAMER-HEADER-EXTRA] the beamer extra headers
So a header like