浏览代码

Revert "* lisp/ob-R.el: Removed reduntant list of header arguments"

This reverts commit 829af89f48fd13e6efefbe4e22a7c147f9d264ba.
Eric Schulte 13 年之前
父节点
当前提交
d3ee6f8a98
共有 1 个文件被更改,包括 15 次插入8 次删除
  1. 15 8
      lisp/ob-R.el

+ 15 - 8
lisp/ob-R.el

@@ -245,20 +245,27 @@ 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
-	    (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) ",")
+	    device filearg out-file args
 	    (if extra-args "," "") (or extra-args ""))))
 
 (defvar org-babel-R-eoe-indicator "'org_babel_R_eoe'")