;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: views.lisp,v 1.30 2003/05/06 22:16:33 kevin Exp $
+;;;; $Id: views.lisp,v 1.31 2003/05/13 15:56:50 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
(indent-spaces indent strm))
(let-when (fmtstr (list-start-fmtstr view))
(let-if (value-func (list-start-value-func view))
- (apply #'format strm fmtstr
- (multiple-value-list (funcall value-func
- obj num-items)))
+ (multiple-value-call #'format strm fmtstr
+ (funcall value-func obj num-items))
(write-string fmtstr strm))))
(defun fmt-list-end (obj view strm indent num-items)
(indent-spaces indent strm))
(let-when (fmtstr (list-end-fmtstr view))
(let-if (value-func (list-end-value-func view))
- (apply #'format strm fmtstr (multiple-value-list
- (funcall value-func obj)))
+ (multiple-value-call #'format strm fmtstr
+ (funcall value-func obj))
(write-string fmtstr strm))))
;;; Object Start and Ends
(indent-spaces indent strm))
(let-when (fmtstr (obj-start-fmtstr view))
(let-if (value-func (obj-start-value-func view))
- (apply #'format strm fmtstr (multiple-value-list
- (funcall value-func obj)))
+ (multiple-value-call #'format strm fmtstr
+ (funcall value-func obj))
(write-string fmtstr strm))))
(defun fmt-obj-end (obj view strm indent)
(indent-spaces indent strm))
(let-when (fmtstr (obj-end-fmtstr view))
(let-if (value-func (obj-end-value-func view))
- (apply #'format strm fmtstr (multiple-value-list
- (funcall value-func obj)))
+ (multiple-value-call #'format strm fmtstr
+ (funcall value-func obj))
(write-string fmtstr strm))))
;;; Object Data
(defun fmt-obj-data-plain (obj view strm)
(awhen (obj-data-value-func view)
- (apply #'format strm (obj-data-fmtstr view)
- (multiple-value-list (funcall it obj)))))
+ (multiple-value-call #'format strm (obj-data-fmtstr view)
+ (funcall it obj))))
(defun fmt-obj-data-with-link (obj view strm refvars)
(let ((refvalues '()))
(defun obj-data (obj view)
"Returns the objects data as a string. Used by common-graphics outline function"
(awhen (obj-data-value-func view)
- (apply #'format nil (funcall (obj-data-fmtstr view))
- (multiple-value-list (funcall it obj)))))
+ (multiple-value-call #'format nil (funcall (obj-data-fmtstr view))
+ (funcall it obj))))
(defun make-link-data-str (obj view)
"Return fmt string for that contains ~a slots for hyperlink link start and end"
(awhen (obj-data-value-func view)
- (apply #'format nil (obj-data-fmtstr view)
- (multiple-value-list (funcall it obj)))))
+ (multiple-value-call #'format nil (obj-data-fmtstr view)
+ (funcall it obj))))
;;; Display method for objects