Aloha all,
I noticed a redundant list of R device header arguments in ob-R.el. The
attached patch removes the redundant list, along with two setq's that
appeared to be unnecessary.
All the best,
Tom
>From 843e173e1135a15a542afa9795de0cd7ed4672e0 Mon Sep 17 00:00:00 2001
From: Thomas Dye <t...@tsdye.com>
Date: Mon, 18 Jun 2012 19:49:58 -1000
Subject: [PATCH] * lisp/ob-R.el: Removed reduntant list of header arguments
---
lisp/ob-R.el | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 0802736..7e8f80e 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -245,27 +245,20 @@ current code buffer."
(:pdf . "pdf")
(:ps . "postscript")
(:postscript . "postscript")))
- (allowed-args '(:width :height :bg :units :pointsize
- :antialias :quality :compression :res
- :type :family :title :fonts :version
- :paper :encoding :pagecentre :colormodel
- :useDingbats :horizontal))
(device (and (string-match ".+\\.\\([^.]+\\)" out-file)
(match-string 1 out-file)))
(extra-args (cdr (assq :R-dev-args params))) filearg args)
(setq device (or (and device (cdr (assq (intern (concat ":" device))
devices))) "png"))
- (setq filearg
- (if (member device '("pdf" "postscript" "svg" "tikz")) "file" "filename"))
- (setq args (mapconcat
- (lambda (pair)
- (if (member (car pair) allowed-args)
- (format ",%s=%S"
- (substring (symbol-name (car pair)) 1)
- (cdr pair)) ""))
- params ""))
(format "%s(%s=\"%s\"%s%s%s)"
- device filearg out-file args
+ device
+ (if (member device '("pdf" "postscript" "svg" "tikz")) "file" "filename")
+ out-file
+ (mapconcat (lambda (pair)
+ (format "%s=%S"
+ (substring (symbol-name (car pair)) 1)
+ (cdr pair)))
+ (remove-if-not #'(lambda (pair) (eq (cdr (assoc (car pair) org-babel-header-args:R)) :any)) params) ",")
(if extra-args "," "") (or extra-args ""))))
(defvar org-babel-R-eoe-indicator "'org_babel_R_eoe'")
--
1.7.5.4
--
Thomas S. Dye
http://www.tsdye.com
