emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[O] [patch] ob-latex: htlatex and imagemagick


From: Andreas Leha
Subject: [O] [patch] ob-latex: htlatex and imagemagick
Date: Sat, 21 Mar 2015 22:22:17 +0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (darwin)

Hi all,

please find attached a small patch that fixes a problem discussed
in [1].

In short, when executing a latex src block and htlatex is a valid
option, it should be used even if imagemagick is part of the headers.

Regards,
Andreas

[1] http://permalink.gmane.org/gmane.emacs.orgmode/96257



>From 2986826441c24e2f0d6cf5efe6bf8aca75c4bdbb Mon Sep 17 00:00:00 2001
From: Andreas Leha <address@hidden>
Date: Sat, 21 Mar 2015 22:11:37 +0000
Subject: [PATCH] ob-latex: htlatex preferred over imagemagick

* ob-latex.el (org-babel-execute:latex): change the order of the handlers

When `imagemagick' is given this entry acts as an else option.
So, it should always come last.
---
 lisp/ob-latex.el | 80 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index ba83bf9..2727a2a 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -99,46 +99,6 @@ This function is called by `org-babel-execute-src-block'."
          (when (file-exists-p out-file) (delete-file out-file))
          (with-temp-file out-file
            (insert body)))
-        ((or (string-match "\\.pdf$" out-file) imagemagick)
-         (with-temp-file tex-file
-           (require 'ox-latex)
-           (insert
-            (org-latex-guess-inputenc
-             (org-splice-latex-header
-              org-format-latex-header
-              (delq
-               nil
-               (mapcar
-                (lambda (el)
-                  (unless (and (listp el) (string= "hyperref" (cadr el)))
-                    el))
-                org-latex-default-packages-alist))
-              org-latex-packages-alist
-              nil))
-            (if fit "\n\\usepackage[active, tightpage]{preview}\n" "")
-            (if border (format "\\setlength{\\PreviewBorder}{%s}" border) "")
-            (if height (concat "\n" (format "\\pdfpageheight %s" height)) "")
-            (if width  (concat "\n" (format "\\pdfpagewidth %s" width))   "")
-            (if headers
-                (concat "\n"
-                        (if (listp headers)
-                            (mapconcat #'identity headers "\n")
-                          headers) "\n")
-              "")
-            (if fit
-                (concat "\n\\begin{document}\n\\begin{preview}\n" body
-                        "\n\\end{preview}\n\\end{document}\n")
-              (concat "\n\\begin{document}\n" body "\n\\end{document}\n"))))
-          (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)
-             (rename-file transient-pdf-file out-file))
-            (imagemagick
-             (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))
               (executable-find org-babel-latex-htlatex))
@@ -184,6 +144,46 @@ This function is called by `org-babel-execute-src-block'."
                                       ".html")
                               out-file)
              (error "HTML file produced but SVG file requested")))))
+        ((or (string-match "\\.pdf$" out-file) imagemagick)
+         (with-temp-file tex-file
+           (require 'ox-latex)
+           (insert
+            (org-latex-guess-inputenc
+             (org-splice-latex-header
+              org-format-latex-header
+              (delq
+               nil
+               (mapcar
+                (lambda (el)
+                  (unless (and (listp el) (string= "hyperref" (cadr el)))
+                    el))
+                org-latex-default-packages-alist))
+              org-latex-packages-alist
+              nil))
+            (if fit "\n\\usepackage[active, tightpage]{preview}\n" "")
+            (if border (format "\\setlength{\\PreviewBorder}{%s}" border) "")
+            (if height (concat "\n" (format "\\pdfpageheight %s" height)) "")
+            (if width  (concat "\n" (format "\\pdfpagewidth %s" width))   "")
+            (if headers
+                (concat "\n"
+                        (if (listp headers)
+                            (mapconcat #'identity headers "\n")
+                          headers) "\n")
+              "")
+            (if fit
+                (concat "\n\\begin{document}\n\\begin{preview}\n" body
+                        "\n\\end{preview}\n\\end{document}\n")
+              (concat "\n\\begin{document}\n" body "\n\\end{document}\n"))))
+          (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)
+             (rename-file transient-pdf-file out-file))
+            (imagemagick
+             (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))))))
          ((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))))
-- 
2.1.1


reply via email to

[Prev in Thread] Current Thread [Next in Thread]