From a2a5c8fd5bc39d333c23d7262732cd1529cc005a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 12 Jul 2013 09:07:23 +0200 Subject: [PATCH] ox-beamer/latex/koma-letter: Fix missing newlines in header * contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Fix missing newlines in header. * lisp/ox-beamer.el (org-beamer-template): Fix missing newlines in header. * lisp/ox-latex.el (org-latex-template): Fix missing newlines in header. --- contrib/lisp/ox-koma-letter.el | 43 +++++++++++++++---------------- lisp/ox-beamer.el | 46 ++++++++++++++++++---------------- lisp/ox-latex.el | 43 +++++++++++++++---------------- 3 files changed, 68 insertions(+), 64 deletions(-) diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index 1ffb455c2..0be0be92b 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -176,27 +176,28 @@ holding export options." (and (plist-get info :time-stamp-file) (format-time-string "%% Created %Y-%m-%d %a %H:%M\n")) ;; Document class and packages. - (let ((class (plist-get info :latex-class)) - (class-options (plist-get info :latex-class-options))) - (org-element-normalize-string - (let* ((header (nth 1 (assoc class org-latex-classes))) - (document-class-string - (and (stringp header) - (if (not class-options) header - (replace-regexp-in-string - "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)" - class-options header t nil 1))))) - (if (not document-class-string) - (user-error "Unknown LaTeX class `%s'") - (org-latex-guess-babel-language - (org-latex-guess-inputenc - (org-splice-latex-header - document-class-string - org-latex-default-packages-alist ; defined in org.el - org-latex-packages-alist nil ; defined in org.el - (concat (plist-get info :latex-header) - (plist-get info :latex-header-extra)))) - info))))) + (let* ((class (plist-get info :latex-class)) + (class-options (plist-get info :latex-class-options)) + (header (nth 1 (assoc class org-latex-classes))) + (document-class-string + (and (stringp header) + (if (not class-options) header + (replace-regexp-in-string + "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)" + class-options header t nil 1))))) + (if (not document-class-string) + (user-error "Unknown LaTeX class `%s'") + (org-latex-guess-babel-language + (org-latex-guess-inputenc + (org-element-normalize-string + (org-splice-latex-header + document-class-string + org-latex-default-packages-alist ; Defined in org.el. + org-latex-packages-alist nil ; Defined in org.el. + (concat (org-element-normalize-string + (plist-get info :latex-header)) + (plist-get info :latex-header-extra))))) + info))) ;; Define "From" data. (format "\\setkomavar{fromname}{%s}\n" (org-export-data (plist-get info :author) info)) diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 3c564b040..003bd97b1 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -856,28 +856,30 @@ holding export options." (and (plist-get info :time-stamp-file) (format-time-string "%% Created %Y-%m-%d %a %H:%M\n")) ;; 2. Document class and packages. - (let ((class (plist-get info :latex-class)) - (class-options (plist-get info :latex-class-options))) - (org-element-normalize-string - (let* ((header (nth 1 (assoc class org-latex-classes))) - (document-class-string - (and (stringp header) - (if (not class-options) header - (replace-regexp-in-string - "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)" - class-options header t nil 1))))) - (if (not document-class-string) - (user-error "Unknown LaTeX class `%s'" class) - (org-latex-guess-babel-language - (org-latex-guess-inputenc - (org-splice-latex-header - document-class-string - org-latex-default-packages-alist - org-latex-packages-alist nil - (concat (plist-get info :latex-header) - (plist-get info :latex-header-extra) - (plist-get info :beamer-header-extra)))) - info))))) + (let* ((class (plist-get info :latex-class)) + (class-options (plist-get info :latex-class-options)) + (header (nth 1 (assoc class org-latex-classes))) + (document-class-string + (and (stringp header) + (if (not class-options) header + (replace-regexp-in-string + "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)" + class-options header t nil 1))))) + (if (not document-class-string) + (user-error "Unknown LaTeX class `%s'" class) + (org-latex-guess-babel-language + (org-latex-guess-inputenc + (org-element-normalize-string + (org-splice-latex-header + document-class-string + org-latex-default-packages-alist + org-latex-packages-alist nil + (concat (org-element-normalize-string + (plist-get info :latex-header)) + (org-element-normalize-string + (plist-get info :latex-header-extra)) + (plist-get info :beamer-header-extra))))) + info))) ;; 3. Insert themes. (let ((format-theme (function diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 0f6fbb5b4..0fffd825f 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1069,27 +1069,28 @@ holding export options." (and (plist-get info :time-stamp-file) (format-time-string "%% Created %Y-%m-%d %a %H:%M\n")) ;; Document class and packages. - (let ((class (plist-get info :latex-class)) - (class-options (plist-get info :latex-class-options))) - (org-element-normalize-string - (let* ((header (nth 1 (assoc class org-latex-classes))) - (document-class-string - (and (stringp header) - (if (not class-options) header - (replace-regexp-in-string - "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)" - class-options header t nil 1))))) - (if (not document-class-string) - (user-error "Unknown LaTeX class `%s'" class) - (org-latex-guess-babel-language - (org-latex-guess-inputenc - (org-splice-latex-header - document-class-string - org-latex-default-packages-alist - org-latex-packages-alist nil - (concat (plist-get info :latex-header) - (plist-get info :latex-header-extra)))) - info))))) + (let* ((class (plist-get info :latex-class)) + (class-options (plist-get info :latex-class-options)) + (header (nth 1 (assoc class org-latex-classes))) + (document-class-string + (and (stringp header) + (if (not class-options) header + (replace-regexp-in-string + "^[ \t]*\\\\documentclass\\(\\(\\[[^]]*\\]\\)?\\)" + class-options header t nil 1))))) + (if (not document-class-string) + (user-error "Unknown LaTeX class `%s'" class) + (org-latex-guess-babel-language + (org-latex-guess-inputenc + (org-element-normalize-string + (org-splice-latex-header + document-class-string + org-latex-default-packages-alist + org-latex-packages-alist nil + (concat (org-element-normalize-string + (plist-get info :latex-header)) + (plist-get info :latex-header-extra))))) + info))) ;; Possibly limit depth for headline numbering. (let ((sec-num (plist-get info :section-numbers))) (when (integerp sec-num)