|
@@ -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
|