From: Aaron Ecay <aaronecay@gmail.com>
Date: Sat, 16 Aug 2014 04:43:37 +0000 (-0400)
Subject: ob-latex: fixes and improvements
X-Git-Tag: release_8.3~932
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/246df88c95203046a78b1d281af4ca4a246a7b5b

ob-latex: fixes and improvements

* lisp/ob-latex.el (convert-pdf): Rename function to have
org-babel-latex- prefix.
(org-babel-execute:latex): Use renamed function.  Include :headers
when generating SVG/HTML also.
---

diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 35b665079..6a7461147 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -135,13 +135,18 @@ This function is called by `org-babel-execute-src-block'."
 	     ((string-match "\\.pdf$" out-file)
 	      (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)))
+	  ;; 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}
@@ -151,6 +156,12 @@ This function is called by `org-babel-execute-src-block'."
 				  (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}")))
@@ -179,7 +190,7 @@ This function is called by `org-babel-execute-src-block'."
         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)))