Browse Source

Fix a780080fcf38ca6412658323eae9367a17a12bdf

* lisp/ox-latex.el (latex): Parse SUBTITLE, DESCRIPTION and KEYWORDS.
* lisp/ox-beamer.el (org-beamer-template): Do not parse again
  SUBTITLE.
Nicolas Goaziou 10 years ago
parent
commit
d7e7b78c2e
2 changed files with 4 additions and 8 deletions
  1. 1 5
      lisp/ox-beamer.el
  2. 3 3
      lisp/ox-latex.el

+ 1 - 5
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)

+ 3 - 3
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)