Merge Org version 8.2.3a.

1 files changed, 75 insertions, 31 deletions

diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 488d2508e6d..cc9186b1adc 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -39,8 +39,6 @@
 
 ;;; Code:
 (require 'ob)
-(require 'ob-ref)
-(require 'ob-comint)
 (eval-when-compile (require 'cl))
 
 (declare-function org-time-string-to-time "org" (s))
@@ -54,77 +52,117 @@
   '((:results . "file") (:exports . "results") (:session . nil))
   "Default arguments to use when evaluating a gnuplot source block.")
 
+(defvar org-babel-header-args:gnuplot
+  '((title      . :any)
+    (lines      . :any)
+    (sets       . :any)
+    (x-labels   . :any)
+    (y-labels   . :any)
+    (timefmt    . :any)
+    (time-ind   . :any)
+    (missing    . :any)
+    (term       . :any))
+  "Gnuplot specific header args.")
+
 (defvar org-babel-gnuplot-timestamp-fmt nil)
 
+(defvar *org-babel-gnuplot-missing* nil)
+
+(defcustom *org-babel-gnuplot-terms*
+  '((eps . "postscript eps"))
+  "List of file extensions and the associated gnuplot terminal."
+  :group 'org-babel
+  :type '(repeat (cons (symbol :tag "File extension")
+                       (string :tag "Gnuplot terminal"))))
+
 (defun org-babel-gnuplot-process-vars (params)
   "Extract variables from PARAMS and process the variables.
 Dumps all vectors into files and returns an association list
 of variable names and the related value to be used in the gnuplot
 code."
-  (mapcar
-   (lambda (pair)
-     (cons
-      (car pair) ;; variable name
-      (if (listp (cdr pair)) ;; variable value
-          (org-babel-gnuplot-table-to-data
-           (cdr pair) (org-babel-temp-file "gnuplot-") params)
-        (cdr pair))))
-   (mapcar #'cdr (org-babel-get-header params :var))))
+  (let ((*org-babel-gnuplot-missing* (cdr (assoc :missing params))))
+    (mapcar
+     (lambda (pair)
+       (cons
+        (car pair) ;; variable name
+        (if (listp (cdr pair)) ;; variable value
+            (org-babel-gnuplot-table-to-data
+             (cdr pair) (org-babel-temp-file "gnuplot-") params)
+          (cdr pair))))
+     (mapcar #'cdr (org-babel-get-header params :var)))))
 
 (defun org-babel-expand-body:gnuplot (body params)
   "Expand BODY according to PARAMS, return the expanded body."
   (save-window-excursion
     (let* ((vars (org-babel-gnuplot-process-vars params))
            (out-file (cdr (assoc :file params)))
-           (term (or (cdr (assoc :term params))
-                     (when out-file (file-name-extension out-file))))
+           (prologue (cdr (assoc :prologue params)))
+           (epilogue (cdr (assoc :epilogue params)))
+           (term (or (cdr (assoc :term params))
+                     (when out-file
+                       (let ((ext (file-name-extension out-file)))
+                         (or (cdr (assoc (intern (downcase ext))
+                                         *org-babel-gnuplot-terms*))
+                             ext)))))
            (cmdline (cdr (assoc :cmdline params)))
-           (title (plist-get params :title))
-           (lines (plist-get params :line))
-           (sets (plist-get params :set))
-           (x-labels (plist-get params :xlabels))
-           (y-labels (plist-get params :ylabels))
-           (timefmt (plist-get params :timefmt))
-           (time-ind (or (plist-get params :timeind)
+           (title (cdr (assoc :title params)))
+           (lines (cdr (assoc :line params)))
+           (sets (cdr (assoc :set params)))
+           (x-labels (cdr (assoc :xlabels params)))
+           (y-labels (cdr (assoc :ylabels params)))
+           (timefmt (cdr (assoc :timefmt params)))
+           (time-ind (or (cdr (assoc :timeind params))
                          (when timefmt 1)))
+           (missing (cdr (assoc :missing params)))
            (add-to-body (lambda (text) (setq body (concat text "\n" body))))
            output)
       ;; append header argument settings to body
-      (when title (funcall add-to-body (format "set title '%s'" title))) ;; title
-      (when lines (mapc (lambda (el) (funcall add-to-body el)) lines)) ;; line
+      (when title (funcall add-to-body (format "set title '%s'" title)))
+      (when lines (mapc (lambda (el) (funcall add-to-body el)) lines))
+      (when missing
+        (funcall add-to-body (format "set datafile missing '%s'" missing)))
       (when sets
         (mapc (lambda (el) (funcall add-to-body (format "set %s" el))) sets))
       (when x-labels
         (funcall add-to-body
                  (format "set xtics (%s)"
                          (mapconcat (lambda (pair)
-                                      (format "\"%s\" %d" (cdr pair) (car pair)))
+                                      (format "\"%s\" %d"
+                                              (cdr pair) (car pair)))
                                     x-labels ", "))))
       (when y-labels
         (funcall add-to-body
                  (format "set ytics (%s)"
                          (mapconcat (lambda (pair)
-                                      (format "\"%s\" %d" (cdr pair) (car pair)))
+                                      (format "\"%s\" %d"
+                                              (cdr pair) (car pair)))
                                     y-labels ", "))))
       (when time-ind
         (funcall add-to-body "set xdata time")
         (funcall add-to-body (concat "set timefmt \""
                                      (or timefmt
                                          "%Y-%m-%d-%H:%M:%S") "\"")))
-      (when out-file (funcall add-to-body (format "set output \"%s\"" out-file)))
+      (when out-file
+        ;; set the terminal at the top of the block
+        (funcall add-to-body (format "set output \"%s\"" out-file))
+        ;; and close the terminal at the bottom of the block
+        (setq body (concat body "\nset output\n")))
       (when term (funcall add-to-body (format "set term %s" term)))
       ;; insert variables into code body: this should happen last
       ;; placing the variables at the *top* of the code in case their
       ;; values are used later
-      (funcall add-to-body (mapconcat #'identity
-                                      (org-babel-variable-assignments:gnuplot params)
-                                      "\n"))
+      (funcall add-to-body
+               (mapconcat #'identity
+                          (org-babel-variable-assignments:gnuplot params)
+                          "\n"))
       ;; replace any variable names preceded by '$' with the actual
       ;; value of the variable
       (mapc (lambda (pair)
               (setq body (replace-regexp-in-string
                           (format "\\$%s" (car pair)) (cdr pair) body)))
-            vars))
+            vars)
+      (when prologue (funcall add-to-body prologue))
+      (when epilogue (setq body (concat body "\n" epilogue))))
     body))
 
 (defun org-babel-execute:gnuplot (body params)
@@ -201,7 +239,8 @@ then create one.  Return the initialized session.  The current
 
 (defun org-babel-gnuplot-quote-timestamp-field (s)
   "Convert S from timestamp to Unix time and export to gnuplot."
-  (format-time-string org-babel-gnuplot-timestamp-fmt (org-time-string-to-time s)))
+  (format-time-string org-babel-gnuplot-timestamp-fmt
+                      (org-time-string-to-time s)))
 
 (defvar org-table-number-regexp)
 (defvar org-ts-regexp3)
@@ -212,7 +251,12 @@ then create one.  Return the initialized session.  The current
   (if (string-match org-table-number-regexp s) s
     (if (string-match org-ts-regexp3 s)
         (org-babel-gnuplot-quote-timestamp-field s)
-      (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\""))))
+      (if (zerop (length s))
+          (or *org-babel-gnuplot-missing* s)
+        (if (string-match "[ \"]" "?")
+            (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"")
+                    "\"")
+          s)))))
 
 (defun org-babel-gnuplot-table-to-data (table data-file params)
   "Export TABLE to DATA-FILE in a format readable by gnuplot.