r4861: Auto commit for Debian build

diff --git a/mop.lisp b/mop.lisp
index 28b2302a6c382ec752f1ade693df2a2f93c45e60..458736b367191021cb18d2d8b093535f336cec1a 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.67 2003/04/29 09:39:45 kevin Exp $
+;;;; $Id: mop.lisp,v 1.68 2003/05/06 22:13:38 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -265,6 +265,10 @@
 #+ho-normal-esdc
 (setq cl:*features* (delete :ho-normal-esdc cl:*features*))
 
+(defun lisp-type-is-a-string (type)
+  (or (eq type string)
+      (and (listp type) (some #'(lambda (x) (eq x string)) type))))
+
 (defun value-type-to-lisp-type (value-type)
   (case (if (atom value-type)
            value-type

diff --git a/views.lisp b/views.lisp
index 37d6ad47759def5d84ced5606eefaa9c76bf8c3c..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.28 2003/05/06 22:00:42 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
 ;;;;
@@ -263,8 +263,7 @@
                           :xhtml-link-labels :xml-link-labels :ie-xml-link
                           :ie-xml-link-labels)
                       (or print-formatter
-                          (string-equal (write-to-string type) "cdata")
-                          (string-equal (write-to-string type) "string")))
+                          (lisp-type-is-a-string type))))
              (setq func `(kmrcl:xml-cdata ,func)))
            (push func value-func))
          )))