r4958: Auto commit for Debian build

[hyperobject.git] / views.lisp

diff --git a/views.lisp b/views.lisp
index ee6008e818e190e8bef5821b5d9d811e66afea3a..d5536ce698344e96f249bdcc8f05eaa58319e35e 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.41 2003/05/14 07:05:24 kevin Exp $
+;;;; $Id: views.lisp,v 1.44 2003/05/14 21:18:12 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -161,9 +161,16 @@
   )
 
 (defmacro write-simple (v s)
-  `(if (stringp ,v)
-    (write-string ,v ,s)
-    (write-string (write-to-string ,v) ,s)))
+  `(typecase ,v
+    (string
+     (write-string ,v ,s))
+    #+allegro
+    (fixnum
+     (excl::print-fixnum ,s 10 ,v)) 
+    (symbol
+     (write-string (symbol-name ,v) ,s))
+    (t
+     (write-string (write-to-string ,v) ,s))))
 
 (defun write-ho-value (obj name type formatter cdata strm)
   (declare (ignorable type))
@@ -272,6 +279,8 @@
           (ppfc-xml xml-tag name type formatter cdata print-func)))
       (:html-link-labels
        (if hyperlink
+          (ppfc-html-link-labels namestr-lower name type formatter cdata nlink
+                                 print-func)
           (ppfc-html-labels namestr-lower name type formatter cdata print-func)))
       (:xhtml-link-labels
        (if hyperlink
@@ -289,7 +298,7 @@
 
 (defun view-has-links-p (view)
   (in (category view) :html-link :xhtml-link :xml-link :ie-xml-link
-      :html-link-labels :xhtml-links-labels :xml-link-labels
+      :html-link-labels :xhtml-link-labels :xml-link-labels
       :ie-xml-link-labels))
 
 (defun initialize-view-by-category (obj-cl view)
@@ -297,6 +306,7 @@
   (unless (in (category view) :compact-text :compact-text-labels
              :html :html-labels :html-link-labels
              :xhtml :xhtml-labels :xhtml-link-labels
+             :xhtml-link :html-link
              :xml :xml-labels :xml-link :ie-xml-link
              :xml-link-labels :ie-xml-link-labels)
     (error "Unknown view category ~A" (category view)))
@@ -548,7 +558,7 @@
   (setf (obj-start-str-or-func view) "<li>")
   (setf (obj-end-indent view)  t)
   (setf (obj-end-str-or-func view)  (format nil "</li>~%"))
-  (setf (obj-data-indent view) t))
+  (setf (obj-data-indent view) nil))
 
 (defun initialize-xhtml-view (view)
   (initialize-text-view view)
@@ -562,7 +572,7 @@
   (setf (obj-start-str-or-func view) "<li>")
   (setf (obj-end-indent view)  t)
   (setf (obj-end-str-or-func view) (format nil "</li>~%"))
-  (setf (obj-data-indent view) t))
+  (setf (obj-data-indent view) nil))
 
 (defun xmlformat-list-end-func (x strm)
   (write-string "</" strm)