From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Moringen Subject: Bug: [Patch] Beamer export default options [6.35i] Date: Sat, 29 May 2010 04:44:04 +0200 Message-ID: <19464_1275101045_ZZh00514Zmr7l.00_1275101044.3678.13.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_seNrNkoYmMTTWgJfooiBoQ)" Return-path: Received: from [140.186.70.92] (port=46219 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OIOOs-0001yn-3U for emacs-orgmode@gnu.org; Sat, 29 May 2010 11:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OIC1x-0004JS-Ey for emacs-orgmode@gnu.org; Fri, 28 May 2010 22:44:10 -0400 Received: from mux2-unibi-smtp.hrz.uni-bielefeld.de ([129.70.204.73]:64216) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OIC1x-0004JF-8l for emacs-orgmode@gnu.org; Fri, 28 May 2010 22:44:09 -0400 Received: from pmxchannel-daemon.mux2-unibi-smtp.hrz.uni-bielefeld.de by mux2-unibi-smtp.hrz.uni-bielefeld.de (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) id <0L3500600U9ICX00@mux2-unibi-smtp.hrz.uni-bielefeld.de> for emacs-orgmode@gnu.org; Sat, 29 May 2010 04:44:06 +0200 (CEST) Received: from [192.168.2.100] ([212.100.48.118]) by mux2-unibi-smtp.hrz.uni-bielefeld.de (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) with ESMTPPSA id <0L3500GI4U9HZR90@mux2-unibi-smtp.hrz.uni-bielefeld.de> for emacs-orgmode@gnu.org; Sat, 29 May 2010 04:44:05 +0200 (CEST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --Boundary_(ID_seNrNkoYmMTTWgJfooiBoQ) Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 7BIT Hi, when playing with the beamer export, I found a small error in the :tag of the org-beamer-themes customization option. Attached is a fix and a related slight improvement. Kind regards, Jan Emacs : GNU Emacs 24.0.50.1 (i686-pc-linux-gnu, GTK+ Version 2.21.0) of 2010-05-28 on gunhead Package: Org-mode version 6.35i --Boundary_(ID_seNrNkoYmMTTWgJfooiBoQ) Content-type: text/x-patch; name=org-beamer-defaults.diff; charset=UTF-8 Content-transfer-encoding: 7BIT Content-disposition: attachment; filename=org-beamer-defaults.diff --- emacs-bzr/lisp/org/org-beamer.el~ 2010-05-28 23:22:15.000000000 +0200 +++ emacs-bzr/lisp/org/org-beamer.el 2010-05-29 04:40:16.505865809 +0200 @@ -64,7 +64,9 @@ "%45ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra)" "Default column view format that should be used to fill the template." :group 'org-beamer - :type '(string :tag "Beamer column view format")) + :type '(choice + (const :tag "Do not insert Beamer column view format" nil) + (string :tag "Beamer column view format"))) (defcustom org-beamer-themes "\\usetheme{default}\\usecolortheme{default}" @@ -72,7 +74,9 @@ When a beamer template is filled, this will be the default for BEAMER_HEADER_EXTRA, which will be inserted just before \\begin{document}." :group 'org-beamer - :type '(string :tag "Beamer column view format")) + :type '(choice + (const :tag "Do not insert Beamer themes" nil) + (string :tag "Beamer themes"))) (defconst org-beamer-column-widths "0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 0.0 :ETC" @@ -587,14 +591,18 @@ (org-entry-put nil "EXPORT_FILE_NAME" "presentation.pdf") (org-entry-put nil "BEAMER_FRAME_LEVEL" (number-to-string org-beamer-frame-level)) - (org-entry-put nil "BEAMER_HEADER_EXTRA" org-beamer-themes) - (org-entry-put nil "COLUMNS" org-beamer-column-view-format) + (when org-beamer-themes + (org-entry-put nil "BEAMER_HEADER_EXTRA" org-beamer-themes)) + (when org-beamer-column-view-format + (org-entry-put nil "COLUMNS" org-beamer-column-view-format)) (org-entry-put nil "BEAMER_col_ALL" "0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 :ETC")) (insert "#+LaTeX_CLASS: beamer\n") (insert "#+LaTeX_CLASS_OPTIONS: [presentation]\n") (insert (format "#+BEAMER_FRAME_LEVEL: %d\n" org-beamer-frame-level) "\n") - (insert "#+BEAMER_HEADER_EXTRA: " org-beamer-themes "\n") - (insert "#+COLUMNS: " org-beamer-column-view-format "\n") + (when org-beamer-themes + (insert "#+BEAMER_HEADER_EXTRA: " org-beamer-themes "\n")) + (when org-beamer-column-view-format + (insert "#+COLUMNS: " org-beamer-column-view-format "\n")) (insert "#+PROPERTY: BEAMER_col_ALL 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 :ETC\n"))) --Boundary_(ID_seNrNkoYmMTTWgJfooiBoQ) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --Boundary_(ID_seNrNkoYmMTTWgJfooiBoQ)--