1 files changed, 92 insertions, 67 deletions
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index d00827645ef..763ffb16ff4 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -1,4 +1,4 @@
-;;; ob-latex.el --- org-babel functions for latex "evaluation"
+;;; ob-latex.el --- Babel Functions for LaTeX        -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
@@ -32,12 +32,11 @@
 ;;; Code:
 (require 'ob)
 
-(declare-function org-create-formula-image "org"
-                  (string tofile options buffer &optional type))
-(declare-function org-splice-latex-header "org"
-		  (tpl def-pkg pkg snippets-p &optional extra))
-(declare-function org-latex-guess-inputenc "ox-latex" (header))
+(declare-function org-create-formula-image "org" (string tofile options buffer &optional type))
 (declare-function org-latex-compile "ox-latex" (texfile &optional snippet))
+(declare-function org-latex-guess-inputenc "ox-latex" (header))
+(declare-function org-splice-latex-header "org" (tpl def-pkg pkg snippets-p &optional extra))
+(declare-function org-trim "org" (s &optional keep-lead))
 
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("latex" . "tex"))
@@ -51,7 +50,22 @@
   '((:results . "latex") (:exports . "results"))
   "Default arguments to use when evaluating a LaTeX source block.")
 
-(defcustom org-babel-latex-htlatex ""
+(defconst org-babel-header-args:latex
+  '((border	  . :any)
+    (fit          . :any)
+    (imagemagick  . ((nil t)))
+    (iminoptions  . :any)
+    (imoutoptions . :any)
+    (packages     . :any)
+    (pdfheight    . :any)
+    (pdfpng       . :any)
+    (pdfwidth     . :any)
+    (headers      . :any)
+    (packages     . :any)
+    (buffer       . ((yes no))))
+  "LaTeX-specific header arguments.")
+
+(defcustom org-babel-latex-htlatex "htlatex"
   "The htlatex command to enable conversion of latex to SVG or HTML."
   :group 'org-babel
   :type 'string)
@@ -70,37 +84,82 @@
                  (regexp-quote (format "%S" (car pair)))
                  (if (stringp (cdr pair))
                      (cdr pair) (format "%S" (cdr pair)))
-                 body))) (mapcar #'cdr (org-babel-get-header params :var)))
-  (org-babel-trim body))
+                 body))) (org-babel--get-vars params))
+  (org-trim body))
 
 (defun org-babel-execute:latex (body params)
   "Execute a block of Latex code with Babel.
 This function is called by `org-babel-execute-src-block'."
   (setq body (org-babel-expand-body:latex body params))
-  (if (cdr (assoc :file params))
-      (let* ((out-file (cdr (assoc :file params)))
+  (if (cdr (assq :file params))
+      (let* ((out-file (cdr (assq :file params)))
+	     (extension (file-name-extension out-file))
 	     (tex-file (org-babel-temp-file "latex-" ".tex"))
-	     (border (cdr (assoc :border params)))
-	     (imagemagick (cdr (assoc :imagemagick params)))
-	     (im-in-options (cdr (assoc :iminoptions params)))
-	     (im-out-options (cdr (assoc :imoutoptions params)))
-	     (pdfpng (cdr (assoc :pdfpng params)))
-	     (fit (or (cdr (assoc :fit params)) border))
-	     (height (and fit (cdr (assoc :pdfheight params))))
-	     (width (and fit (cdr (assoc :pdfwidth params))))
-	     (headers (cdr (assoc :headers params)))
-	     (in-buffer (not (string= "no" (cdr (assoc :buffer params)))))
+	     (border (cdr (assq :border params)))
+	     (imagemagick (cdr (assq :imagemagick params)))
+	     (im-in-options (cdr (assq :iminoptions params)))
+	     (im-out-options (cdr (assq :imoutoptions params)))
+	     (fit (or (cdr (assq :fit params)) border))
+	     (height (and fit (cdr (assq :pdfheight params))))
+	     (width (and fit (cdr (assq :pdfwidth params))))
+	     (headers (cdr (assq :headers params)))
+	     (in-buffer (not (string= "no" (cdr (assq :buffer params)))))
 	     (org-latex-packages-alist
-	      (append (cdr (assoc :packages params)) org-latex-packages-alist)))
+	      (append (cdr (assq :packages params)) org-latex-packages-alist)))
         (cond
-         ((and (string-match "\\.png$" out-file) (not imagemagick))
+         ((and (string-suffix-p ".png" out-file) (not imagemagick))
           (org-create-formula-image
            body out-file org-format-latex-options in-buffer))
-         ((string-match "\\.tikz$" out-file)
+         ((string-suffix-p ".tikz" out-file)
 	  (when (file-exists-p out-file) (delete-file out-file))
 	  (with-temp-file out-file
 	    (insert body)))
-	 ((or (string-match "\\.pdf$" out-file) imagemagick)
+	 ((and (or (string= "svg" extension)
+		   (string= "html" extension))
+	       (executable-find org-babel-latex-htlatex))
+	  ;; TODO: this is a very different way of generating the
+	  ;; frame latex document than in the pdf case.  Ideally, both
+	  ;; would be unified.  This would prevent bugs creeping in
+	  ;; such as the one fixed on Aug 16 2014 whereby :headers was
+	  ;; not included in the SVG/HTML case.
+	  (with-temp-file tex-file
+	    (insert (concat
+		     "\\documentclass[preview]{standalone}
+\\def\\pgfsysdriver{pgfsys-tex4ht.def}
+"
+		     (mapconcat (lambda (pkg)
+				  (concat "\\usepackage" pkg))
+				org-babel-latex-htlatex-packages
+				"\n")
+		     (if headers
+			 (concat "\n"
+				 (if (listp headers)
+				     (mapconcat #'identity headers "\n")
+				   headers) "\n")
+		       "")
+		     "\\begin{document}"
+		     body
+		     "\\end{document}")))
+	  (when (file-exists-p out-file) (delete-file out-file))
+	  (let ((default-directory (file-name-directory tex-file)))
+	    (shell-command (format "%s %s" org-babel-latex-htlatex tex-file)))
+	  (cond
+	   ((file-exists-p (concat (file-name-sans-extension tex-file) "-1.svg"))
+	    (if (string-suffix-p ".svg" out-file)
+		(progn
+		  (shell-command "pwd")
+		  (shell-command (format "mv %s %s"
+					 (concat (file-name-sans-extension tex-file) "-1.svg")
+					 out-file)))
+	      (error "SVG file produced but HTML file requested")))
+	   ((file-exists-p (concat (file-name-sans-extension tex-file) ".html"))
+	    (if (string-suffix-p ".html" out-file)
+		(shell-command "mv %s %s"
+			       (concat (file-name-sans-extension tex-file)
+				       ".html")
+			       out-file)
+	      (error "HTML file produced but SVG file requested")))))
+	 ((or (string= "pdf" extension) imagemagick)
 	  (with-temp-file tex-file
 	    (require 'ox-latex)
 	    (insert
@@ -133,54 +192,20 @@ This function is called by `org-babel-execute-src-block'."
           (when (file-exists-p out-file) (delete-file out-file))
 	  (let ((transient-pdf-file (org-babel-latex-tex-to-pdf tex-file)))
 	    (cond
-	     ((string-match "\\.pdf$" out-file)
+	     ((string= "pdf" extension)
 	      (rename-file transient-pdf-file out-file))
 	     (imagemagick
-	      (convert-pdf
+	      (org-babel-latex-convert-pdf
 	       transient-pdf-file out-file im-in-options im-out-options)
 	      (when (file-exists-p transient-pdf-file)
-		(delete-file transient-pdf-file))))))
-	 ((and (or (string-match "\\.svg$" out-file)
-		   (string-match "\\.html$" out-file))
-	       (not (string= "" org-babel-latex-htlatex)))
-	  (with-temp-file tex-file
-	    (insert (concat
-		     "\\documentclass[preview]{standalone}
-\\def\\pgfsysdriver{pgfsys-tex4ht.def}
-"
-		     (mapconcat (lambda (pkg)
-				  (concat "\\usepackage" pkg))
-				org-babel-latex-htlatex-packages
-				"\n")
-		     "\\begin{document}"
-		     body
-		     "\\end{document}")))
-	  (when (file-exists-p out-file) (delete-file out-file))
-	  (let ((default-directory (file-name-directory tex-file)))
-	    (shell-command (format "%s %s" org-babel-latex-htlatex tex-file)))
-	  (cond
-	   ((file-exists-p (concat (file-name-sans-extension tex-file) "-1.svg"))
-	    (if (string-match "\\.svg$" out-file)
-		(progn
-		  (shell-command "pwd")
-		  (shell-command (format "mv %s %s"
-					 (concat (file-name-sans-extension tex-file) "-1.svg")
-					 out-file)))
-	      (error "SVG file produced but HTML file requested.")))
-	   ((file-exists-p (concat (file-name-sans-extension tex-file) ".html"))
-	    (if (string-match "\\.html$" out-file)
-		(shell-command "mv %s %s"
-			       (concat (file-name-sans-extension tex-file)
-				       ".html")
-			       out-file)
-	      (error "HTML file produced but SVG file requested.")))))
-         ((string-match "\\.\\([^\\.]+\\)$" out-file)
-          (error "Can not create %s files, please specify a .png or .pdf file or try the :imagemagick header argument"
-		 (match-string 1 out-file))))
+		(delete-file transient-pdf-file)))
+	     (t
+	      (error "Can not create %s files, please specify a .png or .pdf file or try the :imagemagick header argument"
+		     extension))))))
         nil) ;; signal that output has already been written to file
     body))
 
-(defun convert-pdf (pdffile out-file im-in-options im-out-options)
+(defun org-babel-latex-convert-pdf (pdffile out-file im-in-options im-out-options)
   "Generate a file from a pdf file using imagemagick."
   (let ((cmd (concat "convert " im-in-options " " pdffile " "
 		     im-out-options " " out-file)))
@@ -192,7 +217,7 @@ This function is called by `org-babel-execute-src-block'."
   (require 'ox-latex)
   (org-latex-compile file))
 
-(defun org-babel-prep-session:latex (session params)
+(defun org-babel-prep-session:latex (_session _params)
   "Return an error because LaTeX doesn't support sessions."
   (error "LaTeX does not support sessions"))