update packages and add valign
This commit is contained in:
@@ -4,8 +4,6 @@
|
||||
|
||||
;; Author: Bruce Ravel <ravel@phys.washington.edu>
|
||||
|
||||
;; This file is not part of GNU Emacs.
|
||||
|
||||
;; This program is free software: you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation, either version 3 of the License, or
|
||||
@@ -872,16 +870,14 @@ Note that \"cntrparam\" is not currently supported."
|
||||
(old-top (gnuplot-gui-get-frame-param 'top)))
|
||||
(when (or
|
||||
(and (equal gnuplot-gui-plot-splot-fit-style 'complete)
|
||||
(cl-member word '("plot" "splot" "fit")
|
||||
:test 'equal))
|
||||
(member word '("plot" "splot" "fit")))
|
||||
(equal word "test"))
|
||||
(gnuplot-gui-set-frame-param 'height 32)
|
||||
(gnuplot-gui-set-frame-param 'top 50))
|
||||
(gnuplot-gui-prompt-for-frame word)
|
||||
(when (or
|
||||
(and (equal gnuplot-gui-plot-splot-fit-style 'complete)
|
||||
(cl-member word '("plot" "splot" "fit")
|
||||
:test 'equal))
|
||||
(member word '("plot" "splot" "fit")))
|
||||
(equal word "test"))
|
||||
(gnuplot-gui-set-frame-param 'height old-height)
|
||||
(gnuplot-gui-set-frame-param 'top old-top)) ))
|
||||
@@ -946,8 +942,8 @@ argument, for example an axis label or a font name. It also replaces
|
||||
bounding single quotes with double quotes, since double quotes are
|
||||
used in `gnuplot-gui-all-types'."
|
||||
(let (fixed-list quote quoted) ; remove blanks
|
||||
(setq list (cl-remove "\\s-+" list :test 'string-match)
|
||||
list (cl-remove "" list :test 'equal))
|
||||
(setq list (cl-remove "\\s-+" list :test #'string-match)
|
||||
list (remove "" list))
|
||||
(while list ; concatinate parts of quoted string
|
||||
(if (not (string-match "^\\([\]\[()'\"]\\)" (car list)))
|
||||
(setq fixed-list (append fixed-list (list (car list))))
|
||||
@@ -998,15 +994,15 @@ arguments."
|
||||
(while temp-list
|
||||
(cond
|
||||
;; ---------------------------- list
|
||||
((cl-member symbol '(list list*) :test 'equal)
|
||||
((memq symbol '(list list*))
|
||||
(let* ((case-fold-search nil)
|
||||
(match-cons (cl-member (concat "^" (car temp-list))
|
||||
values :test 'string-match)))
|
||||
values :test #'string-match)))
|
||||
(if (and (car match-cons) ; " " may be first elem. of list
|
||||
(not (equal " " (car match-cons))))
|
||||
(setq this-cons (cons tag (car match-cons))
|
||||
arg-list (cl-remove (car temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
temp-list nil)
|
||||
(setq temp-list (cdr temp-list)))))
|
||||
;; ---------------------------- tag (first number in list)
|
||||
@@ -1027,16 +1023,16 @@ arguments."
|
||||
(string-match "^[-0-9.]+$" (cadr temp-list)))
|
||||
(setq this-cons (cons tag (cadr temp-list))
|
||||
arg-list (cl-remove (car temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
arg-list (cl-remove (cadr temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
temp-list nil))
|
||||
;; --------------------- number without prefix
|
||||
((and (not prefix)
|
||||
(string-match "^[-0-9.]+$" (car temp-list)))
|
||||
(setq this-cons (cons tag (car temp-list))
|
||||
arg-list (cl-remove (car temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
temp-list nil))
|
||||
(t
|
||||
(setq temp-list (cdr temp-list)))))
|
||||
@@ -1045,8 +1041,8 @@ arguments."
|
||||
(if (and (equal prefix (car temp-list))
|
||||
(string-match "^[-0-9.]+$" (cadr temp-list)))
|
||||
(let ((this-car (cadr temp-list))
|
||||
(this-cdr (if (string-match "^[-0-9.]+$" (cl-caddr temp-list))
|
||||
(cl-caddr temp-list) "")))
|
||||
(this-cdr (if (string-match "^[-0-9.]+$" (caddr temp-list))
|
||||
(caddr temp-list) "")))
|
||||
(setq this-cons (cons tag (cons this-car this-cdr))
|
||||
temp-list nil))
|
||||
(setq temp-list (cdr temp-list))))
|
||||
@@ -1062,7 +1058,7 @@ arguments."
|
||||
(cons tag (cons (match-string 1 (car temp-list))
|
||||
(match-string 2 (car temp-list))))
|
||||
arg-list (cl-remove (car temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
temp-list nil)
|
||||
(setq temp-list (cdr temp-list)) ))
|
||||
;; ---------------------------- labels
|
||||
@@ -1072,7 +1068,7 @@ arguments."
|
||||
")") ; closing paren
|
||||
(car temp-list))
|
||||
(let* ((list (split-string (car temp-list) "[ \t(),]+"))
|
||||
(list (cl-remove "" list :test 'equal))
|
||||
(list (remove "" list))
|
||||
(return ()))
|
||||
(while list
|
||||
(if (string-match "['\"]\\([^'\"]*\\)['\"]" (car list))
|
||||
@@ -1084,18 +1080,18 @@ arguments."
|
||||
(setq list (cdr list)) )
|
||||
(setq this-cons (cons tag return)
|
||||
arg-list (cl-remove (car temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
temp-list nil))
|
||||
(setq temp-list (cdr temp-list))) )
|
||||
;; ---------------------------- string, file, format
|
||||
((cl-member symbol '(string file format) :test 'equal)
|
||||
((memq symbol '(string file format))
|
||||
(if (string-match (concat "['\"]" ; opening quote
|
||||
"\\([^'\"]*\\)" ; string
|
||||
"['\"]") ; closing quote
|
||||
(car temp-list))
|
||||
(setq this-cons (cons tag (match-string 0 (car temp-list)))
|
||||
arg-list (cl-remove (car temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
temp-list nil)
|
||||
(setq temp-list (cdr temp-list)) ))
|
||||
;; ---------------------------- string*
|
||||
@@ -1103,9 +1099,9 @@ arguments."
|
||||
(if (equal prefix (car temp-list))
|
||||
(setq this-cons (cons tag (cadr temp-list))
|
||||
arg-list (cl-remove (car temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
arg-list (cl-remove (cadr temp-list) arg-list
|
||||
:test 'equal :count 1)
|
||||
:test #'equal :count 1)
|
||||
temp-list nil)
|
||||
(setq temp-list (cdr temp-list)) ) )
|
||||
;; ---------------------------- other or unknown
|
||||
@@ -1237,19 +1233,19 @@ SAVE-FRAME is non-nil when the widgets are being reset."
|
||||
(widget-insert "\t") ; insert the appropriate widget
|
||||
(cond
|
||||
;;------------------------------ list, list* ------------
|
||||
((cl-member (eval wtype) '(list list*) :test 'equal)
|
||||
((memq (eval wtype) '(list list*))
|
||||
(let ((starred (if (equal (eval wtype) 'list*) t nil)))
|
||||
(gnuplot-gui-menu-choice tag default list starred)))
|
||||
;;------------------------------ number, tag, fontsize --
|
||||
((cl-member (eval wtype) '(number tag fontsize) :test 'equal)
|
||||
((memq (eval wtype) '(number tag fontsize))
|
||||
(gnuplot-gui-number tag default prefix))
|
||||
;;------------------------------ position ---------------
|
||||
;;------------------------------ range, pair ------------
|
||||
((cl-member (eval wtype) '(range pair) :test 'equal)
|
||||
((memq (eval wtype) '(range pair))
|
||||
(let ((is-range (equal (eval wtype) 'range)))
|
||||
(gnuplot-gui-range tag default prefix is-range)))
|
||||
;;------------------------------ string, string* --------
|
||||
((cl-member (eval wtype) '(string string*) :test 'equal)
|
||||
((memq (eval wtype) '(string string*))
|
||||
(let ((starred (if (equal (eval wtype) 'string) nil t)))
|
||||
(gnuplot-gui-string tag default prefix starred)))
|
||||
;;------------------------------ format -----------------
|
||||
|
||||
Reference in New Issue
Block a user