浏览代码

org-plot.el: tweak term, preamble custom vars

* lisp/org-plot.el (org-plot/gnuplot-script): Call the term and preamble
functions (mentioned below) with the plot type as the argument.
(org-plot/gnuplot-script-preamble, org-plot/gnuplot-term-extra): update
docstring.
TEC 5 年之前
父节点
当前提交
7b5113a3bc
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      lisp/org-plot.el

+ 6 - 4
lisp/org-plot.el

@@ -285,7 +285,8 @@ only present in one alist, DEFAULT is used as the second argument for the FUNCTI
 (defcustom org-plot/gnuplot-script-preamble ""
 (defcustom org-plot/gnuplot-script-preamble ""
   "String or function which provides content to be inserted into the GNUPlot
   "String or function which provides content to be inserted into the GNUPlot
 script before the plot command. Not that this is in addition to, not instead of
 script before the plot command. Not that this is in addition to, not instead of
-other content generated in `org-plot/gnuplot-script'."
+other content generated in `org-plot/gnuplot-script'.
+If a function, it is called with the plot type as the argument."
   :group 'org-plot
   :group 'org-plot
   :type '(choice string function))
   :type '(choice string function))
 
 
@@ -335,7 +336,8 @@ that function. i.e. it is called with the following arguments:
 (defcustom org-plot/gnuplot-term-extra ""
 (defcustom org-plot/gnuplot-term-extra ""
   "String or function which provides the extra term options.
   "String or function which provides the extra term options.
 E.g. a value of \"size 1050,650\" would cause
 E.g. a value of \"size 1050,650\" would cause
-\"set term ... size 1050,650\" to be used."
+\"set term ... size 1050,650\" to be used.
+If a function, it is called with the plot type as the argument."
   :group 'org-plot
   :group 'org-plot
   :type '(choice string function))
   :type '(choice string function))
 
 
@@ -375,14 +377,14 @@ manner suitable for prepending to a user-specified script."
 			 (if file (file-name-extension file) "GNUTERM")
 			 (if file (file-name-extension file) "GNUTERM")
 			 (if (stringp org-plot/gnuplot-term-extra)
 			 (if (stringp org-plot/gnuplot-term-extra)
 			     org-plot/gnuplot-term-extra
 			     org-plot/gnuplot-term-extra
-			   (org-plot/gnuplot-term-extra))))
+			   (org-plot/gnuplot-term-extra type))))
     (when file ; output file
     (when file ; output file
       (funcall ats (format "set output '%s'" file)))
       (funcall ats (format "set output '%s'" file)))
 
 
     (funcall ats
     (funcall ats
 	     (if (stringp org-plot/gnuplot-script-preamble)
 	     (if (stringp org-plot/gnuplot-script-preamble)
 		 org-plot/gnuplot-script-preamble
 		 org-plot/gnuplot-script-preamble
-	       (org-plot/gnuplot-script-preamble)))
+	       (org-plot/gnuplot-script-preamble type)))
 
 
     (pcase type				; type
     (pcase type				; type
       (`2d ())
       (`2d ())