ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-02-11 02:36:15 +01:00
parent eb59c75f39 9070b97f0e
commit 0fe987e060
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org.el
View File

@ -19418,7 +19418,8 @@ a HTML file."
(or (plist-get processing-info :latex-header) (or (plist-get processing-info :latex-header)
(org-latex-make-preamble (org-latex-make-preamble
(org-export-get-environment (org-export-get-backend 'latex)) (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)) (latex-compiler (plist-get processing-info :latex-compiler))
(image-converter (plist-get processing-info :image-converter)) (image-converter (plist-get processing-info :image-converter))
(tmpdir temporary-file-directory) (tmpdir temporary-file-directory)

9
lisp/ox-latex.el
View File

@ -1616,11 +1616,14 @@ INFO is a plist used as a communication channel."
;;; Template ;;; Template
;;;###autoload ;;;###autoload
(defun org-latex-make-preamble (info &optional template) (defun org-latex-make-preamble (info &optional template snippet?)
"Return a formatted LaTeX preamble. "Return a formatted LaTeX preamble.
INFO is a plist used as a communication channel. Optional INFO is a plist used as a communication channel. Optional
argument TEMPLATE, when non-nil, is the header template string, 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)) (let* ((class (plist-get info :latex-class))
(class-options (plist-get info :latex-class-options)) (class-options (plist-get info :latex-class-options))
(header (nth 1 (assoc class (plist-get info :latex-classes)))) (header (nth 1 (assoc class (plist-get info :latex-classes))))
@ -1640,7 +1643,7 @@ as expected by `org-splice-latex-header'."
class-template class-template
(org-latex--remove-packages org-latex-default-packages-alist info) (org-latex--remove-packages org-latex-default-packages-alist info)
(org-latex--remove-packages org-latex-packages-alist info) (org-latex--remove-packages org-latex-packages-alist info)
nil snippet?
(mapconcat #'org-element-normalize-string (mapconcat #'org-element-normalize-string
(list (plist-get info :latex-header) (list (plist-get info :latex-header)
(plist-get info :latex-header-extra)) "")))) (plist-get info :latex-header-extra)) ""))))