From 9e6391389cc196cb121647c6497c7bffd8806a56 Mon Sep 17 00:00:00 2001 From: David Maus Date: Mon, 23 Aug 2010 19:35:43 +0200 Subject: [PATCH 1/3] Don't try to store link if point is at end of buffer. * org-wl.el (org-wl-store-link): Don't try to store link if point is at end of buffer. --- lisp/org-wl.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/org-wl.el b/lisp/org-wl.el index f88d83026..e1222ed82 100644 --- a/lisp/org-wl.el +++ b/lisp/org-wl.el @@ -142,13 +142,14 @@ ENTITY is a message entity." (defun org-wl-store-link () "Store a link to a WL message or folder." - (cond - ((memq major-mode '(wl-summary-mode mime-view-mode)) - (org-wl-store-link-message)) - ((eq major-mode 'wl-folder-mode) - (org-wl-store-link-folder)) - (t - nil))) + (unless (eobp) + (cond + ((memq major-mode '(wl-summary-mode mime-view-mode)) + (org-wl-store-link-message)) + ((eq major-mode 'wl-folder-mode) + (org-wl-store-link-folder)) + (t + nil)))) (defun org-wl-store-link-folder () "Store a link to a WL folder." From 1d1439f91e63e71f39e93622a0af439762522c00 Mon Sep 17 00:00:00 2001 From: Erik Iverson Date: Mon, 23 Aug 2010 23:06:55 -0400 Subject: [PATCH 2/3] babel: R: Respect value of `ess-ask-for-ess-directory' --- lisp/ob-R.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 2a114214b..712ae516d 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -155,7 +155,8 @@ This function is called by `org-babel-execute-src-block'." "If there is not a current R process then create one." (unless (string= session "none") (let ((session (or session "*R*")) - (ess-ask-for-ess-directory (not (cdr (assoc :dir params))))) + (ess-ask-for-ess-directory + (and ess-ask-for-ess-directory (not (cdr (assoc :dir params)))))) (if (org-babel-comint-buffer-livep session) session (save-window-excursion From 5305fe903f6ba3679ec143e9a0fd8c5b01eb2340 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Tue, 24 Aug 2010 19:14:14 -0600 Subject: [PATCH 3/3] ob-latex :fit,:border header arguments and working with the newest latex export code * lisp/ob-latex.el (org-babel-execute:latex): adding new ":fit" and ":border" header arguments which both use the "preview" latex package to fit the resulting pdf image to the figure. (org-babel-latex-tex-to-pdf): updated to the latest code from org-latex.el --- lisp/ob-latex.el | 140 ++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el index 54517910c..0318375fe 100644 --- a/lisp/ob-latex.el +++ b/lisp/ob-latex.el @@ -37,9 +37,18 @@ (declare-function org-splice-latex-header "org" (tpl def-pkg pkg snippets-p &optional extra)) (declare-function org-export-latex-fix-inputenc "org-latex" ()) - (add-to-list 'org-babel-tangle-lang-exts '("latex" . "tex")) +(defvar org-format-latex-header) +(defvar org-format-latex-header-extra) +(defvar org-export-latex-packages-alist) +(defvar org-export-latex-default-packages-alist) +(defvar org-export-pdf-logfiles) +(defvar org-latex-to-pdf-process) +(defvar org-export-pdf-remove-logfiles) +(defvar org-format-latex-options) +(defvar org-export-latex-packages-alist) + (defvar org-babel-default-header-args:latex '((:results . "latex") (:exports . "results")) "Default arguments to use when evaluating a LaTeX source block.") @@ -53,29 +62,53 @@ (if (stringp (cdr pair)) (cdr pair) (format "%S" (cdr pair))) body))) (nth 1 (org-babel-process-params params))) - body) + (org-babel-trim body)) -(defvar org-format-latex-options) -(defvar org-export-latex-packages-alist) (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))) - (tex-file (make-temp-file "org-babel-latex" nil ".tex")) - (pdfheight (cdr (assoc :pdfheight params))) - (pdfwidth (cdr (assoc :pdfwidth params))) - (in-buffer (not (string= "no" (cdr (assoc :buffer params))))) - (org-export-latex-packages-alist - (append (cdr (assoc :packages params)) - org-export-latex-packages-alist))) + (let* ((out-file (cdr (assoc :file params))) + (tex-file (make-temp-file "org-babel-latex" nil ".tex")) + (border (cdr (assoc :border params))) + (fit (or (cdr (assoc :fit params)) border)) + (height (and fit (cdr (assoc :pdfheight params)))) + (width (and fit (cdr (assoc :pdfwidth params)))) + (in-buffer (not (string= "no" (cdr (assoc :buffer params))))) + (org-export-latex-packages-alist + (append (cdr (assoc :packages params)) + org-export-latex-packages-alist))) (cond ((string-match "\\.png$" out-file) (org-create-formula-image body out-file org-format-latex-options in-buffer)) ((string-match "\\.pdf$" out-file) - (org-babel-latex-body-to-tex-file tex-file body pdfheight pdfwidth) + (with-temp-file tex-file + (insert + (org-splice-latex-header + org-format-latex-header + (delq + nil + (mapcar + (lambda (el) + (unless (and (listp el) (string= "hyperref" (cadr el))) + el)) + org-export-latex-default-packages-alist)) + org-export-latex-packages-alist + org-format-latex-header-extra) + (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 org-format-latex-header-extra + (concat "\n" org-format-latex-header-extra) + "") + (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"))) + (org-export-latex-fix-inputenc)) (when (file-exists-p out-file) (delete-file out-file)) (rename-file (org-babel-latex-tex-to-pdf tex-file) out-file)) ((string-match "\\.\\([^\\.]+\\)$" out-file) @@ -84,67 +117,48 @@ This function is called by `org-babel-execute-src-block'." out-file) body)) -(defvar org-format-latex-header) -(defvar org-format-latex-header-extra) -(defvar org-export-latex-packages-alist) -(defvar org-export-latex-default-packages-alist) -(defun org-babel-latex-body-to-tex-file (tex-file body &optional height width) - "Place the contents of BODY into TEX-FILE. -Extracted from `org-create-formula-image' in org.el." - (with-temp-file tex-file - (insert (org-splice-latex-header - org-format-latex-header - (delq - nil - (mapcar - (lambda (el) (unless (and (listp el) (string= "hyperref" (cadr el))) - el)) - org-export-latex-default-packages-alist)) - org-export-latex-packages-alist - org-format-latex-header-extra) - (if height (concat "\n" (format "\\pdfpageheight %s" height)) "") - (if width (concat "\n" (format "\\pdfpagewidth %s" width)) "") - (if org-format-latex-header-extra - (concat "\n" org-format-latex-header-extra) - "") - "\n\\begin{document}\n" body "\n\\end{document}\n") - (org-export-latex-fix-inputenc))) - -(defvar org-export-pdf-logfiles) -(defvar org-latex-to-pdf-process) -(defvar org-export-pdf-remove-logfiles) -(defun org-babel-latex-tex-to-pdf (tex-file) - "Generate a pdf file according to the contents TEX-FILE. +(defun org-babel-latex-tex-to-pdf (file) + "Generate a pdf file according to the contents FILE. Extracted from `org-export-as-pdf' in org-latex.el." (let* ((wconfig (current-window-configuration)) - (default-directory (file-name-directory tex-file)) - (base (file-name-sans-extension tex-file)) + (default-directory (file-name-directory file)) + (base (file-name-sans-extension file)) (pdffile (concat base ".pdf")) (cmds org-latex-to-pdf-process) (outbuf (get-buffer-create "*Org PDF LaTeX Output*")) cmd) + (with-current-buffer outbuf (erase-buffer)) + (message (concat "Processing LaTeX file " file "...")) + (setq output-dir (file-name-directory file)) (if (and cmds (symbolp cmds)) - (funcall cmds tex-file) + (funcall cmds (shell-quote-argument file)) (while cmds - (setq cmd (pop cmds)) - (while (string-match "%b" cmd) - (setq cmd (replace-match - (save-match-data - (shell-quote-argument base)) - t t cmd))) - (while (string-match "%s" cmd) - (setq cmd (replace-match - (save-match-data - (shell-quote-argument tex-file)) - t t cmd))) - (shell-command cmd outbuf outbuf))) + (setq cmd (pop cmds)) + (while (string-match "%b" cmd) + (setq cmd (replace-match + (save-match-data + (shell-quote-argument base)) + t t cmd))) + (while (string-match "%f" cmd) + (setq cmd (replace-match + (save-match-data + (shell-quote-argument file)) + t t cmd))) + (while (string-match "%o" cmd) + (setq cmd (replace-match + (save-match-data + (shell-quote-argument output-dir)) + t t cmd))) + (shell-command cmd outbuf outbuf))) + (message (concat "Processing LaTeX file " file "...done")) (if (not (file-exists-p pdffile)) - (error "PDF file was not produced from %s" tex-file) + (error (concat "PDF file " pdffile " was not produced")) (set-window-configuration wconfig) (when org-export-pdf-remove-logfiles - (dolist (ext org-export-pdf-logfiles) - (setq tex-file (concat base "." ext)) - (and (file-exists-p tex-file) (delete-file tex-file)))) + (dolist (ext org-export-pdf-logfiles) + (setq file (concat base "." ext)) + (and (file-exists-p file) (delete-file file)))) + (message "Exporting to PDF...done") pdffile))) (defun org-babel-prep-session:latex (session params)