From: tsd@tsdye.com (Thomas S. Dye)
To: Org-mode <emacs-orgmode@gnu.org>
Subject: [PATCH] ob-R.el, redundant list
Date: Mon, 18 Jun 2012 20:04:54 -1000 [thread overview]
Message-ID: <m1a9zzsupl.fsf@tsdye.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Patch to ob-R.el --]
[-- Type: text/x-patch, Size: 1894 bytes --]
From 843e173e1135a15a542afa9795de0cd7ed4672e0 Mon Sep 17 00:00:00 2001
From: Thomas Dye <tsd@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
[-- Attachment #3: Type: text/plain, Size: 40 bytes --]
--
Thomas S. Dye
http://www.tsdye.com
next reply other threads:[~2012-06-19 6:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-19 6:04 Thomas S. Dye [this message]
2012-06-19 13:26 ` [PATCH] ob-R.el, redundant list Eric Schulte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m1a9zzsupl.fsf@tsdye.com \
--to=tsd@tsdye.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).