summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-03-06 13:33:51 +0100
committerNicolas Goaziou <n.goaziou@gmail.com>2013-03-06 13:37:13 +0100
commit8c48e8b2acb25177705de428b0afee11df6ce0c4 (patch)
tree90f1320ce74d2060c0ea65f8f19038d8577eaa7c
parent10c735f18a8aa6586057d42a84e5d974ba2d1608 (diff)
downloadorg-mode-8c48e8b2acb25177705de428b0afee11df6ce0c4.tar.gz
ox-beamer: Remove frame arount toc when generated from a TOC keyword
* lisp/ox-beamer.el (org-beamer-keyword): Remove frame arount toc when generated from a TOC keyword. Since TOC keywords are a way to add a table of contents at some precise location, it is reasonable to think the user will also want to control the frame surronding it. Table of contents generated with toc:t option item still get wrapped within a frame.
-rw-r--r--lisp/ox-beamer.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el
index 24d58bd..17b2ced 100644
--- a/lisp/ox-beamer.el
+++ b/lisp/ox-beamer.el
@@ -97,6 +97,11 @@
;; sets overlay specifications and the last one inserts optional
;; arguments in current list environment.
;;
+;; Table of contents generated from "toc:t" option item are wrapped
+;; within a "frame" environment. Those generated from a TOC keyword
+;; aren't. TOC keywords accept options enclosed within square
+;; brackets (e.g. #+TOC: headlines [currentsection]).
+;;
;; Eventually, an export snippet with a value enclosed within angular
;; brackets put at the beginning of an element or object whose type is
;; among `bold', `item', `link', `radio-target' and `target' will
@@ -706,10 +711,8 @@ channel."
(options (and (string-match "\\[.*?\\]" value)
(match-string 0 value))))
(concat
- "\\begin{frame}"
(when (wholenump depth) (format "\\setcounter{tocdepth}{%s}\n" depth))
- "\\tableofcontents" options "\n"
- "\\end{frame}")))
+ "\\tableofcontents" options)))
(t (org-export-with-backend 'latex keyword contents info)))))