Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-05-14 19:01:20 +02:00
commit 1f7b310142
1 changed files with 10 additions and 8 deletions

View File

@ -2446,15 +2446,17 @@ CONTENTS is nil. INFO is a plist holding contextual information."
;;;; Latex Environment ;;;; Latex Environment
(defun org-html-format-latex (latex-frag processing-type) (defun org-html-format-latex (latex-frag processing-type)
"Format the LaTeX fragment LATEX-FRAG into HTML." "Format a LaTeX fragment LATEX-FRAG into HTML."
(let ((cache-relpath "") (cache-dir "") bfn) (let ((cache-relpath "") (cache-dir ""))
(unless (eq processing-type 'mathjax) (unless (eq processing-type 'mathjax)
(setq bfn (buffer-file-name) (let ((bfn (or (buffer-file-name)
cache-relpath (make-temp-name
(concat "ltxpng/" (expand-file-name "latex" temporary-file-directory)))))
(file-name-sans-extension (setq cache-relpath
(file-name-nondirectory bfn))) (concat "ltxpng/"
cache-dir (file-name-directory bfn))) (file-name-sans-extension
(file-name-nondirectory bfn)))
cache-dir (file-name-directory bfn))))
(with-temp-buffer (with-temp-buffer
(insert latex-frag) (insert latex-frag)
(org-format-latex cache-relpath cache-dir nil "Creating LaTeX Image..." (org-format-latex cache-relpath cache-dir nil "Creating LaTeX Image..."