diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-02-11 02:36:15 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-02-11 02:36:15 +0100 |
commit | 0fe987e060fd293b6733ee9309776feb022c215f (patch) | |
tree | a91fdd376d48bf109daace8d03da4edb7143b32c | |
parent | eb59c75f394ddec8f0714ccff3e9a6280ee1898d (diff) | |
parent | 9070b97f0e3d69a35f1cb2b809415e42c1170d7a (diff) | |
download | org-mode-0fe987e060fd293b6733ee9309776feb022c215f.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 3 | ||||
-rw-r--r-- | lisp/ox-latex.el | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index 19ad0a3..a1a3dc7 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19418,7 +19418,8 @@ a HTML file." (or (plist-get processing-info :latex-header) (org-latex-make-preamble (org-export-get-environment (org-export-get-backend 'latex)) - org-format-latex-header))) + org-format-latex-header + 'snippet))) (latex-compiler (plist-get processing-info :latex-compiler)) (image-converter (plist-get processing-info :image-converter)) (tmpdir temporary-file-directory) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 7c5ae50..aba34c2 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1616,11 +1616,14 @@ INFO is a plist used as a communication channel." ;;; Template ;;;###autoload -(defun org-latex-make-preamble (info &optional template) +(defun org-latex-make-preamble (info &optional template snippet?) "Return a formatted LaTeX preamble. INFO is a plist used as a communication channel. Optional argument TEMPLATE, when non-nil, is the header template string, -as expected by `org-splice-latex-header'." +as expected by `org-splice-latex-header'. When SNIPPET? is +non-nil, only includes packages relevant to image generation, as +specified in `org-latex-default-packages-alist' or +`org-latex-packages-alist'." (let* ((class (plist-get info :latex-class)) (class-options (plist-get info :latex-class-options)) (header (nth 1 (assoc class (plist-get info :latex-classes)))) @@ -1640,7 +1643,7 @@ as expected by `org-splice-latex-header'." class-template (org-latex--remove-packages org-latex-default-packages-alist info) (org-latex--remove-packages org-latex-packages-alist info) - nil + snippet? (mapconcat #'org-element-normalize-string (list (plist-get info :latex-header) (plist-get info :latex-header-extra)) "")))) |