X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=ef116ac0c25c2ed6768f54fb6fe78c2022603904;hb=247fa39146e69b658f5adf5145a3472487eab321;hp=6776e39e1bc57a8455aa4a7711f09e7a4de281e4;hpb=3537a8422aeb2817b41ee835c5ff45ba1d973c98;p=hyperobject.git
diff --git a/views.lisp b/views.lisp
index 6776e39..ef116ac 100644
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: views.lisp,v 1.56 2003/06/17 17:50:45 kevin Exp $
+;;;; $Id: views.lisp,v 1.57 2003/06/20 08:35:21 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
;;;; *************************************************************************
@@ -176,9 +176,8 @@
`(typecase ,v
(string
(write-string ,v ,s))
- #+allegro
(fixnum
- (excl::print-fixnum ,s 10 ,v))
+ (write-fixnum ,v ,s))
(symbol
(write-string (symbol-name ,v) ,s))
(t
@@ -406,6 +405,7 @@
(setf (list-start-printer view)
(compile nil
(eval '(lambda (obj nitems indent strm)
+ (declare (ignore indent))
(write-user-name-maybe-plural obj nitems strm)
(write-char #\: strm)
(write-char #\Newline strm)))))
@@ -415,7 +415,9 @@
(setf (indenter view) #'indent-spaces))
(defun html-list-start-func (obj nitems indent strm)
- (write-string "
" strm)
+ (write-string "
" strm)
(write-user-name-maybe-plural obj nitems strm)
(write-string "
" strm)
(write-char #\newline strm)
@@ -424,7 +426,7 @@
(defun initialize-html-view (view)
(initialize-text-view view)
- (setf (indenter view) #'indent-html-spaces)
+ (setf (indenter view) #'indent-spaces)
(setf (file-start-str view) (format nil "~%"))
(setf (file-end-str view) (format nil "~%"))
(setf (list-start-indent view) t)
@@ -439,28 +441,33 @@
(setf (obj-data-indent view) nil))
(defun xhtml-list-start-func (obj nitems indent strm)
- (write-string "
" strm)
- (indent-html-spaces indent strm)
+ (write-string "
" strm)
(write-user-name-maybe-plural obj nitems strm)
(write-string "
" strm)
+ (write-string "
" strm)
(write-char #\newline strm))
+(defun html-obj-start (obj indent strm)
+ (declare (ignore obj indent))
+ (write-string "
~%"))
(setf (file-end-str view) (format nil "~%"))
(setf (list-start-indent view) nil)
(setf (list-start-printer view) #'xhtml-list-start-func)
- (setf (list-end-printer view) (format nil "~%"))
+ (setf (list-end-printer view) (format nil "
~%"))
(setf (list-end-indent view) nil)
(setf (obj-start-indent view) nil)
- (setf (obj-start-printer view) nil)
+ (setf (obj-start-printer view) #'html-obj-start)
(setf (obj-end-printer view) (format nil "
~%"))
- (setf (obj-data-start-printer view) "
")
- (setf (obj-data-end-printer view) nil)
- (setf (obj-end-indent view) nil)
- (setf (obj-data-indent view) t))
+ (setf (obj-data-indent view) nil))
(defun xmlformat-list-end-func (x strm)
(write-string "" strm)
@@ -470,6 +477,7 @@
(write-char #\newline strm))
(defun xmlformat-list-start-func (x nitems indent strm)
+ (declare (ignore indent))
(write-char #\< strm)
(write-string (class-name-of x) strm)
(write-string "list>
" strm)
@@ -532,7 +540,7 @@
(awhen (obj-start-printer view)
(if (stringp it)
(write-string it strm)
- (funcall it obj strm))))
+ (funcall it obj indent strm))))
(defun fmt-obj-end (obj view strm indent)
(when (obj-end-indent view)
@@ -550,7 +558,7 @@
(awhen (subobj-start-printer view)
(if (stringp it)
(write-string it strm)
- (funcall it obj strm))))
+ (funcall it obj indent strm))))
(defun fmt-subobj-end (obj view strm indent)
(when (subobj-end-indent view)