From d7e7b78c2e222f637556d94d28950db747b9104b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 9 Apr 2015 10:04:29 +0200 Subject: [PATCH] Fix a780080fcf38ca6412658323eae9367a17a12bdf * lisp/ox-latex.el (latex): Parse SUBTITLE, DESCRIPTION and KEYWORDS. * lisp/ox-beamer.el (org-beamer-template): Do not parse again SUBTITLE. --- lisp/ox-beamer.el | 6 +----- lisp/ox-latex.el | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 321963f7b..1dfd3d74f 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -821,11 +821,7 @@ information." CONTENTS is the transcoded contents string. INFO is a plist holding export options." (let ((title (org-export-data (plist-get info :title) info)) - (subtitle (org-export-data - (org-element-parse-secondary-string - (plist-get info :subtitle) - (org-element-restriction 'keyword)) - info))) + (subtitle (org-export-data (plist-get info :subtitle) info))) (concat ;; 1. Time-stamp. (and (plist-get info :time-stamp-file) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 0f6d8cde1..3cd02cace 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -108,9 +108,9 @@ (:latex-class-options "LATEX_CLASS_OPTIONS" nil nil t) (:latex-header "LATEX_HEADER" nil nil newline) (:latex-header-extra "LATEX_HEADER_EXTRA" nil nil newline) - (:description "DESCRIPTION" nil nil newline) - (:keywords "KEYWORDS" nil nil space) - (:subtitle "SUBTITLE" nil nil space) + (:description "DESCRIPTION" nil nil parse) + (:keywords "KEYWORDS" nil nil parse) + (:subtitle "SUBTITLE" nil nil parse) ;; Other variables. (:latex-active-timestamp-format nil nil org-latex-active-timestamp-format) (:latex-caption-above nil nil org-latex-caption-above) -- 2.11.4.GIT