Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2020-05-10 14:54:36 +02:00
commit 7801e92369

View file

@ -109,8 +109,11 @@ This function is called by `org-babel-execute-src-block'."
(append (cdr (assq :packages params)) org-latex-packages-alist))) (append (cdr (assq :packages params)) org-latex-packages-alist)))
(cond (cond
((and (string-suffix-p ".png" out-file) (not imagemagick)) ((and (string-suffix-p ".png" out-file) (not imagemagick))
(let ((org-format-latex-header
(concat org-format-latex-header "\n"
(mapconcat #'identity headers "\n"))))
(org-create-formula-image (org-create-formula-image
body out-file org-format-latex-options in-buffer)) body out-file org-format-latex-options in-buffer)))
((string-suffix-p ".tikz" out-file) ((string-suffix-p ".tikz" out-file)
(when (file-exists-p out-file) (delete-file out-file)) (when (file-exists-p out-file) (delete-file out-file))
(with-temp-file out-file (with-temp-file out-file