r4861: Auto commit for Debian build

[hyperobject.git] / views.lisp

diff --git a/views.lisp b/views.lisp
index de238b4f34fa72ffda73699099de299c0104f20a..ad1874d58bf0222045b56550facccb95c107bae0 100644 (file)
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.26 2003/04/16 18:37:47 kevin Exp $
+;;;; $Id: views.lisp,v 1.29 2003/05/06 22:13:38 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -43,19 +43,19 @@
                 :accessor file-end-str)
    (list-start-fmtstr :type (or string null) :initform nil :initarg :list-start-fmtstr
                      :accessor list-start-fmtstr)
-   (list-start-value-func :type (or function null) :initform nil
+   (list-start-value-func :type (or function symbol null) :initform nil
                          :initarg :list-start-value-func
                          :accessor list-start-value-func)
    (list-start-indent :initform nil :initarg :list-start-indent
                      :accessor list-start-indent)
    (list-end-fmtstr :type (or string null) :initform nil :initarg :list-end-fmtstr
                    :accessor list-end-fmtstr)
-   (list-end-value-func :type (or function null) :initform nil
+   (list-end-value-func :type (or function symbol null) :initform nil
                        :initarg :list-end-value-func
                        :accessor list-end-value-func)
    (list-end-indent :initform nil :initarg :list-end-indent
                    :accessor list-end-indent)
-   (obj-start-fmtstr :type (or string null) :initform nil :initarg :obj-start-fmtstr
+   (obj-start-fmtstr :type (or string symbol null) :initform nil :initarg :obj-start-fmtstr
                     :accessor obj-start-fmtstr)
    (obj-start-value-func :initform nil :initarg :obj-start-value-func
                         :accessor obj-start-value-func)
@@ -63,7 +63,7 @@
                     :accessor obj-start-indent)
    (obj-end-fmtstr :type (or string null) :initform nil :initarg :obj-end-fmtstr
                   :accessor obj-end-fmtstr)
-   (obj-end-value-func :type (or function null) :initform nil
+   (obj-end-value-func :type (or function symbol null) :initform nil
                       :initarg :obj-end-value-func
                       :accessor obj-end-value-func)
    (obj-end-indent :initform nil :initarg :obj-end-indent
@@ -75,7 +75,7 @@
    (obj-data-end-fmtstr :type (or string null) :initform nil
                        :initarg :obj-data-end-fmtstr
                        :accessor obj-data-end-fmtstr)
-   (obj-data-value-func :type (or function null) :initform nil
+   (obj-data-value-func :type (or function symbol null) :initform nil
                        :initarg :obj-data-value-func
                        :accessor obj-data-value-func)
    (link-slots :type list :initform nil
@@ -263,7 +263,7 @@
                           :xhtml-link-labels :xml-link-labels :ie-xml-link
                           :ie-xml-link-labels)
                       (or print-formatter
-                          (string-equal (write-to-string type) "string")))
+                          (lisp-type-is-a-string type))))
              (setq func `(kmrcl:xml-cdata ,func)))
            (push func value-func))
          )))