summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Dittmann <github@christoph-d.de>2012-02-07 14:43:26 +0100
committerBastien Guerry <bzg@altern.org>2012-04-20 11:46:22 +0200
commitf2e40fe153a6d1fd07fb678cd0dd7fc52d716717 (patch)
treec7abd09a0a1461ff832bed9789ed0af98b9a1c00
parentd1f1c586d5324eb17c97db87598eb6cd3842ebe8 (diff)
downloadorg-mode-f2e40fe153a6d1fd07fb678cd0dd7fc52d716717.tar.gz
Make [fragile] work with overlay specifications.
* org-beamer.el (org-beamer-auto-fragile-frames): Make [fragile] work with overlay specifications. If the BEAMER_envargs property contains optional parameters together with an overlay specification like [option]<1-2>, the exporter turns the start of the frame into \begin{frame}<1-2>[option]. If then [fragile] needs to be added, this becomes \begin{frame}[fragile]<1-2>[option] and causes a LaTeX error. With this patch [fragile] is added in a way such that the line becomes \begin{frame}<1-2>[fragile,option]. TINYCHANGE
-rw-r--r--lisp/org-beamer.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el
index 966db82..b24a7ad 100644
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@@ -503,7 +503,7 @@ This function will run in the final LaTeX document."
(while (re-search-forward org-beamer-fragile-re nil t)
(save-excursion
;; Are we inside a frame here?
- (when (and (re-search-backward "^[ \t]*\\\\\\(begin\\|end\\){frame}"
+ (when (and (re-search-backward "^[ \t]*\\\\\\(begin\\|end\\){frame}\\(<[^>]*>\\)?"
nil t)
(equal (match-string 1) "begin"))
;; yes, inside a frame, make sure "fragile" is one of the options